pds: fix some PLC and DID bugs

7 files changed, 811 insertions, 19 deletions

diff --git a/Cargo.lock b/Cargo.lock
index 84dc965..df42992 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -36,13 +36,17 @@ version = "0.1.0-dev.0"
 dependencies = [
  "anyhow",
  "bcrypt",
+ "data-encoding",
  "futures",
  "ipfs-sqlite-block-store",
  "iroh-car",
  "jsonschema",
+ "k256",
  "lazy_static",
  "libipld",
  "log",
+ "multibase",
+ "p256",
  "pretty_env_logger",
  "rouille",
  "rusqlite",
@@ -242,12 +246,24 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "4cbbc9d0964165b47557570cce6c952866c2678457aca742aafc9fb771d30270"
 
 [[package]]
+name = "base16ct"
+version = "0.1.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "349a06037c7bf932dd7e7d1f653678b2038b9ad46a74102f1fc7bd7872678cce"
+
+[[package]]
 name = "base64"
 version = "0.13.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "9e1b586273c5702936fe7b7d6896644d8be71e6314cfe09d3167c95f712589e8"
 
 [[package]]
+name = "base64ct"
+version = "1.5.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b645a089122eccb6111b4f81cbc1a49f5900ac4666bb93ac027feaecf15607bf"
+
+[[package]]
 name = "bcrypt"
 version = "0.13.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
@@ -682,6 +698,12 @@ dependencies = [
 ]
 
 [[package]]
+name = "const-oid"
+version = "0.9.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "722e23542a15cea1f65d4a1419c4cfd7a26706c70871a13a04238ca3f40f1661"
+
+[[package]]
 name = "constant_time_eq"
 version = "0.1.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
@@ -781,6 +803,18 @@ dependencies = [
 ]
 
 [[package]]
+name = "crypto-bigint"
+version = "0.4.9"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ef2b4b23cddf68b89b8f8069890e8c270d54e2d5fe1b143820234805e4cb17ef"
+dependencies = [
+ "generic-array",
+ "rand_core 0.6.4",
+ "subtle",
+ "zeroize",
+]
+
+[[package]]
 name = "crypto-common"
 version = "0.1.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
@@ -970,6 +1004,16 @@ dependencies = [
 ]
 
 [[package]]
+name = "der"
+version = "0.6.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "13dd2ae565c0a381dde7fade45fce95984c568bdcb4700a4fdbe3175e0380b2f"
+dependencies = [
+ "const-oid",
+ "zeroize",
+]
+
+[[package]]
 name = "derive_more"
 version = "0.99.17"
 source = "registry+https://github.com/rust-lang/crates.io-index"
@@ -999,6 +1043,7 @@ checksum = "adfbc57365a37acbd2ebf2b64d7e69bb766e2fea813521ed536f5d0520dcf86c"
 dependencies = [
  "block-buffer 0.10.3",
  "crypto-common",
+ "subtle",
 ]
 
 [[package]]
@@ -1044,12 +1089,44 @@ dependencies = [
 ]
 
 [[package]]
+name = "ecdsa"
+version = "0.14.8"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "413301934810f597c1d19ca71c8710e99a3f1ba28a0d2ebc01551a2daeea3c5c"
+dependencies = [
+ "der",
+ "elliptic-curve",
+ "rfc6979",
+ "signature",
+]
+
+[[package]]
 name = "either"
 version = "1.8.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "90e5c1c8368803113bf0c9584fc495a58b86dc8a29edbf8fe877d21d9507e797"
 
 [[package]]
+name = "elliptic-curve"
+version = "0.12.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e7bb888ab5300a19b8e5bceef25ac745ad065f3c9f7efc6de1b91958110891d3"
+dependencies = [
+ "base16ct",
+ "crypto-bigint",
+ "der",
+ "digest 0.10.5",
+ "ff",
+ "generic-array",
+ "group",
+ "pkcs8",
+ "rand_core 0.6.4",
+ "sec1",
+ "subtle",
+ "zeroize",
+]
+
+[[package]]
 name = "embed_plist"
 version = "1.2.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
@@ -1122,6 +1199,16 @@ dependencies = [
 ]
 
 [[package]]
+name = "ff"
+version = "0.12.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d013fc25338cc558c5c2cfbad646908fb23591e2404481826742b651c9af7160"
+dependencies = [
+ "rand_core 0.6.4",
+ "subtle",
+]
+
+[[package]]
 name = "field-offset"
 version = "0.3.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
@@ -1530,6 +1617,17 @@ dependencies = [
 ]
 
 [[package]]
+name = "group"
+version = "0.12.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5dfbfb3a6cfbd390d5c9564ab283a0349b9b9fcd46a706c1eb10e0db70bfbac7"
+dependencies = [
+ "ff",
+ "rand_core 0.6.4",
+ "subtle",
+]
+
+[[package]]
 name = "gtk"
 version = "0.15.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
@@ -1667,6 +1765,15 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "7f24254aa9a54b5c858eaee2f5bccdb46aaf0e486a595ed5fd8f86ba55232a70"
 
 [[package]]
+name = "hmac"
+version = "0.12.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6c49c37c09c17a53d937dfbb742eb3a961d65a994e6bcdcf37e7399d0cc8ab5e"
+dependencies = [
+ "digest 0.10.5",
+]
+
+[[package]]
 name = "html5ever"
 version = "0.25.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
@@ -2069,6 +2176,18 @@ dependencies = [
 ]
 
 [[package]]
+name = "k256"
+version = "0.11.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "72c1e0b51e7ec0a97369623508396067a486bd0cbed95a2659a4b863d28cfc8b"
+dependencies = [
+ "cfg-if",
+ "ecdsa",
+ "elliptic-curve",
+ "sha2 0.10.6",
+]
+
+[[package]]
 name = "keccak"
 version = "0.1.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
@@ -2794,6 +2913,17 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "b15813163c1d831bf4a13c3610c05c0d03b39feb07f7e09fa234dac9b15aaf39"
 
 [[package]]
+name = "p256"
+version = "0.11.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "51f44edd08f51e2ade572f141051021c5af22677e42b7dd28a88155151c33594"
+dependencies = [
+ "ecdsa",
+ "elliptic-curve",
+ "sha2 0.10.6",
+]
+
+[[package]]
 name = "pango"
 version = "0.15.10"
 source = "registry+https://github.com/rust-lang/crates.io-index"
@@ -3015,6 +3145,16 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "8b870d8c151b6f2fb93e84a13146138f05d02ed11c7e7c54f8826aaaf7c9f184"
 
 [[package]]
+name = "pkcs8"
+version = "0.9.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9eca2c590a5f85da82668fa685c09ce2888b9430e83299debf1f34b65fd4a4ba"
+dependencies = [
+ "der",
+ "spki",
+]
+
+[[package]]
 name = "pkg-config"
 version = "0.3.26"
 source = "registry+https://github.com/rust-lang/crates.io-index"
@@ -3392,6 +3532,17 @@ dependencies = [
 ]
 
 [[package]]
+name = "rfc6979"
+version = "0.3.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "88c86280f057430a52f4861551b092a01b419b8eacefc7c995eacb9dc132fe32"
+dependencies = [
+ "crypto-bigint",
+ "hmac",
+ "zeroize",
+]
+
+[[package]]
 name = "rfd"
 version = "0.10.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
@@ -3582,6 +3733,20 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "9c8132065adcfd6e02db789d9285a0deb2f3fcb04002865ab67d5fb103533898"
 
 [[package]]
+name = "sec1"
+version = "0.3.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3be24c1842290c45df0a7bf069e0c268a747ad05a192f2fd7dcfdbc1cba40928"
+dependencies = [
+ "base16ct",
+ "der",
+ "generic-array",
+ "pkcs8",
+ "subtle",
+ "zeroize",
+]
+
+[[package]]
 name = "security-framework"
 version = "2.7.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
@@ -3843,6 +4008,16 @@ dependencies = [
 ]
 
 [[package]]
+name = "signature"
+version = "1.6.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "74233d3b3b2f6d4b006dc19dee745e73e2a6bfb6f93607cd3b02bd5b00797d7c"
+dependencies = [
+ "digest 0.10.5",
+ "rand_core 0.6.4",
+]
+
+[[package]]
 name = "siphasher"
 version = "0.3.10"
 source = "registry+https://github.com/rust-lang/crates.io-index"
@@ -3902,6 +4077,16 @@ dependencies = [
 ]
 
 [[package]]
+name = "spki"
+version = "0.6.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "67cf02bbac7a337dc36e4f5a693db6c21e7863f45070f7064577eb4367a3212b"
+dependencies = [
+ "base64ct",
+ "der",
+]
+
+[[package]]
 name = "stable_deref_trait"
 version = "1.2.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
@@ -4000,6 +4185,12 @@ dependencies = [
 ]
 
 [[package]]
+name = "subtle"
+version = "2.4.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6bdef32e8150c2a081110b42772ffe7d7c9032b606bc226c8260fd97e0976601"
+
+[[package]]
 name = "syn"
 version = "1.0.103"
 source = "registry+https://github.com/rust-lang/crates.io-index"
diff --git a/adenosine-pds/Cargo.toml b/adenosine-pds/Cargo.toml
index 48154e7..8fdc138 100644
--- a/adenosine-pds/Cargo.toml
+++ b/adenosine-pds/Cargo.toml
@@ -32,6 +32,10 @@ futures = "0.3"
 sha256 = "*"
 lazy_static = "*"
 bcrypt = "0.13"
+data-encoding = "*"
+k256 = { version = "*", features = ["ecdsa"] }
+p256 = { version = "*", features = ["ecdsa"] }
+multibase = "*"
 
 [package.metadata.deb]
 maintainer = "Bryan Newbold <bnewbold@robocracy.org>"
diff --git a/adenosine-pds/plan.txt b/adenosine-pds/plan.txt
index caedf50..ac285fd 100644
--- a/adenosine-pds/plan.txt
+++ b/adenosine-pds/plan.txt
@@ -2,26 +2,55 @@
 PDS proof of concept:
 x ipld sqlite driver importing CAR file
     => simple binary, two args
-- MST code to read and mutate tree state
-    => just read the whole tree and then write the whole tree
-    => with tests
-- skeleton
+x skeleton
   x env config: DB paths, port
   x commands: serve, import, inspect
   x integration test
-    database wrappers
+  x atp db wrapper (with methods)
+        schema in a single .sql file
+        https://docs.rs/rusqlite_migration/latest/rusqlite_migration/
+        test version (in memory, per-thread)
+        wrap in a mutex, unwrap and make new connection when desired
+  x wrap both database in a struct with mutexes; have "get handle" helper that unlocks and returns a connection copy of the given type
+  x repo store database wrapper (with methods)
+  x response error handling (especially for XRPC endpoints)
+- basic crypto and did:plc stuff
+    did:key read/write helpers
+    signature read/write helpers
+    test that did:plc generated as expected
+- MST code to read and mutate tree state
+    => just read the whole tree and then write the whole tree
+    => check that empty tree works (eg, for account creation, and after deletes)
+    => with in-memory tests
+- service-level config
+    domain suffixes (eg, just ".test" for now)
+    account registration allowed or not
+    CLI account creation (?)
+    PDS signing key
+- 
 - implement basic non-authenticated CRUD on repository, test with CLI
     com.atproto
         createAccount
+        repoDescribe
         repoGetRecord
         repoListRecords
         repoBatchWrite
-        repoCreateRecord
-        repoPutRecord
-        repoDeleteRecord
-        syncGetRepo
+            repoCreateRecord
+            repoPutRecord
+            repoDeleteRecord
         syncGetRoot
+        syncGetRepo
         syncUpdateRepo
+- single shared signing key for all users (not what I expected)
+- helper web methods
+
+    xrpc_wrap<S: Serialize>(resp: Result<S>) -> Response
+
+    xrpc_get_atproto(endpoint: &str, req) -> Result<Value>
+    xrpc_post_atproto(endpoint: &str, req) -> Result<Value>
+
+    xrpc_wrap(xrpc_get_atproto(srv, "asdf", req))
+
 ? python test script
 - sqlite schema (for application)
 - write wrapper which updates MST *and* updates other tables in a transaction
@@ -31,7 +60,6 @@ x ipld sqlite driver importing CAR file
         createSession
         getAccountsConfig
         getSession
-        repoDescribe
         resolveName
     app.bsky
         getHomeFeed
@@ -55,15 +83,21 @@ other utils/helpers:
 libraries:
 - `jsonschema` to validate requests and records (rich validation)
 - `schemafy` to codegen serde types for records (ahead of time?)
+- pretty_env_logger
+- no good published crate for working with CAR files... could rip out this code?
+    https://github.com/n0-computer/iroh/tree/main/iroh-car
+- ??? for CBOR (de)serialization of MST, separate from the IPLD stuff?
+
+sync option:
+- `rouille` web framework
 - `rusqlite` with "bundled" sqlite for datastore
+- `rusqlite_migration`
 - `ipfs-sqlite-block-store` and `libipld` to parse and persist repo content 
+
+async option:
 - `warp` as async HTTP service
-- `deadpool-sqlite` or `tokio-rusqlite` to use rusqlite from async code?
-- `r2d2` to wrap rusqlite (?)
-- pretty_env_logger
-- ??? for CBOR (de)serialization of MST, separate from the IPLD stuff?
-- no good crate for working with CAR files... could rip out this code?
-    https://github.com/n0-computer/iroh/tree/main/iroh-car
+- `sqlx` for async pooled sqlite or postgresql db
+- `iroh-store` for async rocksdb IPFS blockstore
 
 ## concurrency (in warp app)
 
diff --git a/adenosine-pds/src/crypto.rs b/adenosine-pds/src/crypto.rs
new file mode 100644
index 0000000..e94c34a
--- /dev/null
+++ b/adenosine-pds/src/crypto.rs
@@ -0,0 +1,217 @@
+use anyhow::{anyhow, ensure, Result};
+use k256;
+use k256::ecdsa::signature::{Signer, Verifier};
+use multibase;
+use p256;
+use std::str::FromStr;
+
+// Need to:
+//
+// - generate new random keypair
+// - generate keypair from seed
+// - read/write secret keypair (eg, for PDS config loading)
+// - sign bytes (and ipld?) using keypair
+// - verify signature bytes (and ipld?) using pubkey
+
+const MULTICODE_P256_BYTES: [u8; 2] = [0x80, 0x24];
+const MULTICODE_K256_BYTES: [u8; 2] = [0xe7, 0x01];
+
+pub struct KeyPair {
+    public: p256::ecdsa::VerifyingKey,
+    secret: p256::ecdsa::SigningKey,
+}
+
+pub enum PubKey {
+    P256(p256::ecdsa::VerifyingKey),
+    K256(k256::ecdsa::VerifyingKey),
+}
+
+impl KeyPair {
+    pub fn new_random() -> Self {
+        let signing = p256::ecdsa::SigningKey::random(&mut p256::elliptic_curve::rand_core::OsRng);
+        KeyPair {
+            public: signing.verifying_key(),
+            secret: signing,
+        }
+    }
+
+    pub fn from_bytes(bytes: &[u8]) -> Result<KeyPair> {
+        let signing = p256::ecdsa::SigningKey::from_bytes(bytes)?;
+        Ok(KeyPair {
+            public: signing.verifying_key(),
+            secret: signing,
+        })
+    }
+
+    pub fn to_bytes(&self) -> Vec<u8> {
+        self.secret.to_bytes().to_vec()
+    }
+
+    pub fn pubkey(&self) -> PubKey {
+        PubKey::P256(self.public.clone())
+    }
+
+    pub fn sign_bytes(&self, data: &[u8]) -> String {
+        println!("BYTES: {:?}", data);
+        let sig = self.secret.sign(data);
+        data_encoding::BASE64URL_NOPAD.encode(&sig.to_vec())
+    }
+}
+
+impl PubKey {
+    pub fn verify_bytes(&self, data: &[u8], sig: &str) -> Result<()> {
+        println!("BYTES: {:?}", data);
+        let sig_bytes = data_encoding::BASE64URL_NOPAD.decode(sig.as_bytes())?;
+        // TODO: better way other than this re-encoding?
+        let sig_hex = data_encoding::HEXUPPER.encode(&sig_bytes);
+        match self {
+            PubKey::P256(key) => {
+                println!("pre-parse: {}", sig);
+                let sig = p256::ecdsa::Signature::from_str(&sig_hex)?;
+                println!("parsed: {}", sig);
+                Ok(key.verify(data, &sig)?)
+            }
+            PubKey::K256(key) => {
+                let sig = k256::ecdsa::Signature::from_str(&sig_hex)?;
+                Ok(key.verify(data, &sig)?)
+            }
+        }
+    }
+
+    pub fn key_type(&self) -> String {
+        match self {
+            PubKey::P256(_) => "EcdsaSecp256r1VerificationKey2019",
+            PubKey::K256(_) => "EcdsaSecp256k1VerificationKey2019",
+        }
+        .to_string()
+    }
+
+    /// This public verification key encoded as base58btc multibase string
+    pub fn to_multibase(&self) -> String {
+        let mut bytes: Vec<u8> = vec![];
+        match self {
+            PubKey::P256(key) => {
+                bytes.extend_from_slice(&MULTICODE_P256_BYTES);
+                bytes.extend_from_slice(&key.to_encoded_point(true).to_bytes());
+            }
+            PubKey::K256(key) => {
+                bytes.extend_from_slice(&MULTICODE_K256_BYTES);
+                bytes.extend_from_slice(&key.to_bytes());
+            }
+        }
+        format!("{}", multibase::encode(multibase::Base::Base58Btc, &bytes))
+    }
+
+    pub fn to_did_key(&self) -> String {
+        format!("did:key:{}", self.to_multibase())
+    }
+
+    pub fn from_did_key(did_key: &str) -> Result<Self> {
+        if !did_key.starts_with("did:key:") || did_key.len() < 20 {
+            return Err(anyhow!("does not look like a did:key: {}", did_key));
+        }
+        let (key_type, bytes) = multibase::decode(&did_key[8..])?;
+        ensure!(
+            key_type == multibase::Base::Base58Btc,
+            "base58btc-encoded key"
+        );
+        // prefix bytes
+        let prefix: [u8; 2] = [bytes[0], bytes[1]];
+        match prefix {
+            MULTICODE_K256_BYTES => Ok(PubKey::K256(k256::ecdsa::VerifyingKey::from_sec1_bytes(
+                &bytes[2..],
+            )?)),
+            MULTICODE_P256_BYTES => Ok(PubKey::P256(p256::ecdsa::VerifyingKey::from_sec1_bytes(
+                &bytes[2..],
+            )?)),
+            _ => Err(anyhow!(
+                "key type (multicodec) not handled when parsing DID key: {}",
+                did_key
+            )),
+        }
+    }
+
+    pub fn to_bytes(&self) -> Vec<u8> {
+        match self {
+            PubKey::P256(key) => key.to_encoded_point(true).to_bytes().to_vec(),
+            PubKey::K256(key) => key.to_bytes().to_vec(),
+        }
+    }
+}
+
+impl std::fmt::Display for PubKey {
+    // TODO: what should this actually be, instead of multibase? the did:key representation?
+    fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
+        write!(f, "{}", self.to_multibase())
+    }
+}
+
+#[test]
+fn test_did_secp256k1_p256() {
+    // did:key secp256k1 test vectors from W3C
+    // https://github.com/w3c-ccg/did-method-key/blob/main/test-vectors/secp256k1.json
+    // via atproto repo
+    let pairs = vec![
+        (
+            "9085d2bef69286a6cbb51623c8fa258629945cd55ca705cc4e66700396894e0c",
+            "did:key:zQ3shokFTS3brHcDQrn82RUDfCZESWL1ZdCEJwekUDPQiYBme",
+        ),
+        (
+            "f0f4df55a2b3ff13051ea814a8f24ad00f2e469af73c363ac7e9fb999a9072ed",
+            "did:key:zQ3shtxV1FrJfhqE1dvxYRcCknWNjHc3c5X1y3ZSoPDi2aur2",
+        ),
+        (
+            "6b0b91287ae3348f8c2f2552d766f30e3604867e34adc37ccbb74a8e6b893e02",
+            "did:key:zQ3shZc2QzApp2oymGvQbzP8eKheVshBHbU4ZYjeXqwSKEn6N",
+        ),
+        (
+            "c0a6a7c560d37d7ba81ecee9543721ff48fea3e0fb827d42c1868226540fac15",
+            "did:key:zQ3shadCps5JLAHcZiuX5YUtWHHL8ysBJqFLWvjZDKAWUBGzy",
+        ),
+        (
+            "175a232d440be1e0788f25488a73d9416c04b6f924bea6354bf05dd2f1a75133",
+            "did:key:zQ3shptjE6JwdkeKN4fcpnYQY3m9Cet3NiHdAfpvSUZBFoKBj",
+        ),
+    ];
+
+    // test decode/encode did:key
+    for (hex, did) in pairs.iter() {
+        assert_eq!(did, &PubKey::from_did_key(did).unwrap().to_did_key());
+    }
+
+    let p256_dids = vec![
+        "did:key:zDnaerx9CtbPJ1q36T5Ln5wYt3MQYeGRG5ehnPAmxcf5mDZpv",
+        "did:key:zDnaerDaTF5BXEavCrfRZEk316dpbLsfPDZ3WJ5hRTPFU2169",
+    ];
+    for did in p256_dids {
+        assert_eq!(did, &PubKey::from_did_key(did).unwrap().to_did_key());
+    }
+}
+
+#[test]
+fn test_did_plc_examples() {
+    // https://atproto.com/specs/did-plc
+    let example_dids = vec![
+        "did:key:zDnaejYFhgFiVF89LhJ4UipACLKuqo6PteZf8eKDVKeExXUPk",
+        "did:key:zDnaeSezF2TgCD71b5DiiFyhHQwKAfsBVqTTHRMvP597Z5Ztn",
+        "did:key:zDnaeh9v2RmcMo13Du2d6pjUf5bZwtauYxj3n9dYjw4EZUAR7",
+        "did:key:zDnaedvvAsDE6H3BDdBejpx9ve2Tz95cymyCAKF66JbyMh1Lt",
+    ];
+
+    for did in example_dids {
+        assert_eq!(did, &PubKey::from_did_key(did).unwrap().to_did_key());
+    }
+}
+
+#[test]
+fn test_signing() {
+    let msg = b"you have found the secret message";
+    let keypair = KeyPair::new_random();
+    let sig_str = keypair.sign_bytes(msg);
+    keypair.pubkey().verify_bytes(msg, &sig_str).unwrap();
+
+    // and with pubkey that has been serialized/deserialized
+    let did_key = keypair.pubkey().to_did_key();
+    let pubkey = PubKey::from_did_key(&did_key).unwrap();
+    pubkey.verify_bytes(msg, &sig_str).unwrap();
+}
diff --git a/adenosine-pds/src/did.rs b/adenosine-pds/src/did.rs
new file mode 100644
index 0000000..f33f512
--- /dev/null
+++ b/adenosine-pds/src/did.rs
@@ -0,0 +1,342 @@
+use crate::{KeyPair, PubKey};
+/// DID and 'did:plc' stuff
+///
+/// This is currently a partial/skeleton implementation, which only generates local/testing did:plc
+/// DIDs (and DID documents) using a single 'create' genesis block. Key rotation, etc, is not
+/// supported.
+use anyhow::Result;
+use libipld::cbor::DagCborCodec;
+use libipld::multihash::Code;
+use libipld::{Block, Cid, DagCbor, DefaultParams};
+use serde_json::json;
+
+#[allow(non_snake_case)]
+#[derive(Debug, DagCbor, PartialEq, Eq, Clone)]
+struct CreateOp {
+    #[ipld(rename = "type")]
+    pub op_type: String,
+    pub signingKey: String,
+    pub recoveryKey: String,
+    pub username: String,
+    pub service: String,
+    pub prev: Option<Cid>,
+    pub sig: String,
+}
+
+#[allow(non_snake_case)]
+#[derive(Debug, DagCbor, PartialEq, Eq, Clone)]
+struct UnsignedCreateOp {
+    #[ipld(rename = "type")]
+    pub op_type: String,
+    pub signingKey: String,
+    pub recoveryKey: String,
+    pub username: String,
+    pub service: String,
+    pub prev: Option<Cid>,
+}
+
+impl UnsignedCreateOp {
+    fn into_signed(self, sig: String) -> CreateOp {
+        CreateOp {
+            op_type: self.op_type,
+            prev: self.prev,
+            sig: sig,
+            signingKey: self.signingKey,
+            recoveryKey: self.recoveryKey,
+            username: self.username,
+            service: self.service,
+        }
+    }
+}
+
+impl CreateOp {
+    fn new(
+        username: String,
+        atp_pds: String,
+        keypair: &KeyPair,
+        recovery_key: Option<String>,
+    ) -> Self {
+        let signing_key = keypair.pubkey().to_did_key();
+        let recovery_key = recovery_key.unwrap_or(signing_key.clone());
+        let unsigned = UnsignedCreateOp {
+            op_type: "create".to_string(),
+            prev: None,
+            signingKey: signing_key,
+            recoveryKey: recovery_key.to_string(),
+            username: username.to_string(),
+            service: atp_pds.to_string(),
+        };
+        let block = Block::<DefaultParams>::encode(DagCborCodec, Code::Sha2_256, &unsigned)
+            .expect("encode DAG-CBOR");
+        let sig = keypair.sign_bytes(block.data());
+        unsigned.into_signed(sig)
+    }
+
+    fn did_plc(&self) -> String {
+        // dump DAG-CBOR
+        let block = Block::<DefaultParams>::encode(DagCborCodec, Code::Sha2_256, self)
+            .expect("encode DAG-CBOR");
+        let bin = block.data();
+        // hash SHA-256
+        let digest_bytes: Vec<u8> = data_encoding::HEXLOWER
+            .decode(&sha256::digest(bin).as_bytes())
+            .expect("SHA-256 digest is always hex string");
+        // encode base32
+        let digest_b32 = data_encoding::BASE32_NOPAD
+            .encode(&digest_bytes)
+            .to_ascii_lowercase();
+        // truncate
+        format!("did:plc:{}", &digest_b32[0..24])
+    }
+
+    fn did_doc(&self) -> serde_json::Value {
+        let did = self.did_plc();
+        // TODO:
+        let user_url = format!("https://{}.test", self.username);
+        let key_type = "EcdsaSecp256r1VerificationKey2019";
+        json!({
+            "@context": [
+                "https://www.w3.org/ns/did/v1",
+                "https://w3id.org/security/suites/ecdsa-2019/v1"
+            ],
+            "id": did,
+            "alsoKnownAs": [ user_url ],
+            "verificationMethod": [
+                {
+                "id": format!("{}#signingKey)", did),
+                "type": key_type,
+                "controller": did,
+                "publicKeyMultibase": self.signingKey
+                },
+                {
+                "id": format!("{}#recoveryKey)", did),
+                "type": key_type,
+                "controller": did,
+                "publicKeyMultibase": self.recoveryKey
+                }
+            ],
+            "assertionMethod": [ format!("{}#signingKey)", did)],
+            "capabilityInvocation": [ format!("{}#signingKey)", did) ],
+            "capabilityDelegation": [ format!("{}#signingKey)", did) ],
+            "service": [
+                {
+                "id": format!("{}#atpPds)", did),
+                "type": "AtpPersonalDataServer",
+                "serviceEndpoint": self.service
+                }
+            ]
+        })
+    }
+
+    fn into_unsigned(self) -> UnsignedCreateOp {
+        UnsignedCreateOp {
+            op_type: self.op_type,
+            prev: self.prev,
+            signingKey: self.signingKey,
+            recoveryKey: self.recoveryKey,
+            username: self.username,
+            service: self.service,
+        }
+    }
+
+    /// This method only makes sense on the "genesis" create object
+    fn verify_self(&self) -> Result<()> {
+        let key = PubKey::from_did_key(&self.signingKey)?;
+        let unsigned = {
+            let cpy = (*self).clone();
+            cpy.into_unsigned()
+        };
+        println!("unsigned: {:?}", unsigned);
+        let block = Block::<DefaultParams>::encode(DagCborCodec, Code::Sha2_256, &unsigned)
+            .expect("encode DAG-CBOR");
+        key.verify_bytes(block.data(), &self.sig)
+    }
+}
+
+#[test]
+fn test_debug_did_signing() {
+    let op = UnsignedCreateOp {
+        op_type: "create".to_string(),
+        signingKey: "did:key:zDnaeSWVQyW8DSF6mDwT9j8YrzDWDs8h6PPjuTcipzG84iCBE".to_string(),
+        recoveryKey: "did:key:zDnaeSWVQyW8DSF6mDwT9j8YrzDWDs8h6PPjuTcipzG84iCBE".to_string(),
+        username: "carla.test".to_string(),
+        service: "http://localhost:2583".to_string(),
+        prev: None,
+    };
+    let block =
+        Block::<DefaultParams>::encode(DagCborCodec, Code::Sha2_256, &op).expect("encode DAG-CBOR");
+    let op_bytes = block.data();
+
+    let key_bytes = vec![
+        4, 30, 224, 8, 198, 84, 108, 1, 58, 193, 91, 176, 212, 45, 4, 36, 28, 252, 242, 95, 20, 85,
+        87, 246, 79, 134, 42, 113, 5, 216, 238, 235, 21, 146, 16, 88, 239, 217, 36, 252, 148, 197,
+        203, 22, 29, 2, 52, 152, 77, 208, 21, 88, 2, 85, 219, 212, 148, 139, 104, 200, 15, 119, 46,
+        178, 186,
+    ];
+
+    let pub_key =
+        PubKey::from_did_key("did:key:zDnaeSWVQyW8DSF6mDwT9j8YrzDWDs8h6PPjuTcipzG84iCBE").unwrap();
+    //let keypair = KeyPair::from_bytes(&key_bytes).unwrap();
+    //assert_eq!(keypair.to_bytes(), key_bytes);
+
+    let encoded_bytes = vec![
+        166, 100, 112, 114, 101, 118, 246, 100, 116, 121, 112, 101, 102, 99, 114, 101, 97, 116,
+        101, 103, 115, 101, 114, 118, 105, 99, 101, 117, 104, 116, 116, 112, 58, 47, 47, 108, 111,
+        99, 97, 108, 104, 111, 115, 116, 58, 50, 53, 56, 51, 104, 117, 115, 101, 114, 110, 97, 109,
+        101, 106, 99, 97, 114, 108, 97, 46, 116, 101, 115, 116, 106, 115, 105, 103, 110, 105, 110,
+        103, 75, 101, 121, 120, 57, 100, 105, 100, 58, 107, 101, 121, 58, 122, 68, 110, 97, 101,
+        83, 87, 86, 81, 121, 87, 56, 68, 83, 70, 54, 109, 68, 119, 84, 57, 106, 56, 89, 114, 122,
+        68, 87, 68, 115, 56, 104, 54, 80, 80, 106, 117, 84, 99, 105, 112, 122, 71, 56, 52, 105, 67,
+        66, 69, 107, 114, 101, 99, 111, 118, 101, 114, 121, 75, 101, 121, 120, 57, 100, 105, 100,
+        58, 107, 101, 121, 58, 122, 68, 110, 97, 101, 83, 87, 86, 81, 121, 87, 56, 68, 83, 70, 54,
+        109, 68, 119, 84, 57, 106, 56, 89, 114, 122, 68, 87, 68, 115, 56, 104, 54, 80, 80, 106,
+        117, 84, 99, 105, 112, 122, 71, 56, 52, 105, 67, 66, 69,
+    ];
+    assert_eq!(encoded_bytes, op_bytes);
+
+    let sig_bytes = vec![
+        131, 115, 47, 143, 89, 68, 79, 73, 121, 198, 70, 76, 91, 64, 171, 25, 18, 139, 244, 94,
+        123, 224, 205, 32, 241, 174, 36, 120, 199, 206, 199, 202, 216, 154, 2, 10, 247, 101, 138,
+        170, 85, 95, 142, 164, 50, 203, 92, 23, 247, 218, 231, 224, 78, 68, 55, 104, 243, 145, 243,
+        4, 219, 102, 44, 227,
+    ];
+    let sig_str =
+        "g3Mvj1lET0l5xkZMW0CrGRKL9F574M0g8a4keMfOx8rYmgIK92WKqlVfjqQyy1wX99rn4E5EN2jzkfME22Ys4w";
+
+    pub_key.verify_bytes(op_bytes, sig_str).unwrap();
+
+    let signed = op.into_signed(sig_str.to_string());
+    signed.verify_self().unwrap();
+}
+
+/*
+------------------------------------
+OP:
+{
+  type: 'create',
+  signingKey: 'did:key:zDnaesoxZb8mLjf16e4PWsNqLLj9uWM9TQ8nNwxqErDmKXLAN',
+  recoveryKey: 'did:key:zDnaesoxZb8mLjf16e4PWsNqLLj9uWM9TQ8nNwxqErDmKXLAN',
+  username: 'carla.test',
+  service: 'http://localhost:2583',
+  prev: null,
+  sig: 'VYGxmZs-D5830YdQSNrZpbxVyOPB4nCJtO-x0XElt35AE5wjvJFa2vJu8qjURG6TvEbMvfbekDo_eXEMhdPWdg'
+}
+ENCODED:
+{"0":167,"1":99,"2":115,"3":105,"4":103,"5":120,"6":86,"7":86,"8":89,"9":71,"10":120,"11":109,"12":90,"13":115,"14":45,"15":68,"16":53,"17":56,"18":51,"19":48,"20":89,"21":100,"22":81,"23":83,"24":78,"25":114,"26":90,"27":112,"28":98,"29":120,"30":86,"31":121,"32":79,"33":80,"34":66,"35":52,"36":110,"37":67,"38":74,"39":116,"40":79,"41":45,"42":120,"43":48,"44":88,"45":69,"46":108,"47":116,"48":51,"49":53,"50":65,"51":69,"52":53,"53":119,"54":106,"55":118,"56":74,"57":70,"58":97,"59":50,"60":118,"61":74,"62":117,"63":56,"64":113,"65":106,"66":85,"67":82,"68":71,"69":54,"70":84,"71":118,"72":69,"73":98,"74":77,"75":118,"76":102,"77":98,"78":101,"79":107,"80":68,"81":111,"82":95,"83":101,"84":88,"85":69,"86":77,"87":104,"88":100,"89":80,"90":87,"91":100,"92":103,"93":100,"94":112,"95":114,"96":101,"97":118,"98":246,"99":100,"100":116,"101":121,"102":112,"103":101,"104":102,"105":99,"106":114,"107":101,"108":97,"109":116,"110":101,"111":103,"112":115,"113":101,"114":114,"115":118,"116":105,"117":99,"118":101,"119":117,"120":104,"121":116,"122":116,"123":112,"124":58,"125":47,"126":47,"127":108,"128":111,"129":99,"130":97,"131":108,"132":104,"133":111,"134":115,"135":116,"136":58,"137":50,"138":53,"139":56,"140":51,"141":104,"142":117,"143":115,"144":101,"145":114,"146":110,"147":97,"148":109,"149":101,"150":106,"151":99,"152":97,"153":114,"154":108,"155":97,"156":46,"157":116,"158":101,"159":115,"160":116,"161":106,"162":115,"163":105,"164":103,"165":110,"166":105,"167":110,"168":103,"169":75,"170":101,"171":121,"172":120,"173":57,"174":100,"175":105,"176":100,"177":58,"178":107,"179":101,"180":121,"181":58,"182":122,"183":68,"184":110,"185":97,"186":101,"187":115,"188":111,"189":120,"190":90,"191":98,"192":56,"193":109,"194":76,"195":106,"196":102,"197":49,"198":54,"199":101,"200":52,"201":80,"202":87,"203":115,"204":78,"205":113,"206":76,"207":76,"208":106,"209":57,"210":117,"211":87,"212":77,"213":57,"214":84,"215":81,"216":56,"217":110,"218":78,"219":119,"220":120,"221":113,"222":69,"223":114,"224":68,"225":109,"226":75,"227":88,"228":76,"229":65,"230":78,"231":107,"232":114,"233":101,"234":99,"235":111,"236":118,"237":101,"238":114,"239":121,"240":75,"241":101,"242":121,"243":120,"244":57,"245":100,"246":105,"247":100,"248":58,"249":107,"250":101,"251":121,"252":58,"253":122,"254":68,"255":110,"256":97,"257":101,"258":115,"259":111,"260":120,"261":90,"262":98,"263":56,"264":109,"265":76,"266":106,"267":102,"268":49,"269":54,"270":101,"271":52,"272":80,"273":87,"274":115,"275":78,"276":113,"277":76,"278":76,"279":106,"280":57,"281":117,"282":87,"283":77,"284":57,"285":84,"286":81,"287":56,"288":110,"289":78,"290":119,"291":120,"292":113,"293":69,"294":114,"295":68,"296":109,"297":75,"298":88,"299":76,"300":65,"301":78}
+SHA256 base32:
+cg2dfxdh5voabmdjzw2abw3sgvtjymknh2bmpvtwot7t2ih4v7za
+did:plc:cg2dfxdh5voabmdjzw2abw3s
+------------------------------------
+
+*/
+
+#[test]
+fn test_debug_did_plc() {
+    let op = CreateOp {
+        op_type: "create".to_string(),
+        signingKey: "did:key:zDnaesoxZb8mLjf16e4PWsNqLLj9uWM9TQ8nNwxqErDmKXLAN".to_string(),
+        recoveryKey: "did:key:zDnaesoxZb8mLjf16e4PWsNqLLj9uWM9TQ8nNwxqErDmKXLAN".to_string(),
+        username: "carla.test".to_string(),
+        service: "http://localhost:2583".to_string(),
+        prev: None,
+        sig:
+            "VYGxmZs-D5830YdQSNrZpbxVyOPB4nCJtO-x0XElt35AE5wjvJFa2vJu8qjURG6TvEbMvfbekDo_eXEMhdPWdg"
+                .to_string(),
+    };
+    op.verify_self().unwrap();
+    let block =
+        Block::<DefaultParams>::encode(DagCborCodec, Code::Sha2_256, &op).expect("encode DAG-CBOR");
+    let op_bytes = block.data();
+
+    let encoded_bytes = vec![
+        167, 99, 115, 105, 103, 120, 86, 86, 89, 71, 120, 109, 90, 115, 45, 68, 53, 56, 51, 48, 89,
+        100, 81, 83, 78, 114, 90, 112, 98, 120, 86, 121, 79, 80, 66, 52, 110, 67, 74, 116, 79, 45,
+        120, 48, 88, 69, 108, 116, 51, 53, 65, 69, 53, 119, 106, 118, 74, 70, 97, 50, 118, 74, 117,
+        56, 113, 106, 85, 82, 71, 54, 84, 118, 69, 98, 77, 118, 102, 98, 101, 107, 68, 111, 95,
+        101, 88, 69, 77, 104, 100, 80, 87, 100, 103, 100, 112, 114, 101, 118, 246, 100, 116, 121,
+        112, 101, 102, 99, 114, 101, 97, 116, 101, 103, 115, 101, 114, 118, 105, 99, 101, 117, 104,
+        116, 116, 112, 58, 47, 47, 108, 111, 99, 97, 108, 104, 111, 115, 116, 58, 50, 53, 56, 51,
+        104, 117, 115, 101, 114, 110, 97, 109, 101, 106, 99, 97, 114, 108, 97, 46, 116, 101, 115,
+        116, 106, 115, 105, 103, 110, 105, 110, 103, 75, 101, 121, 120, 57, 100, 105, 100, 58, 107,
+        101, 121, 58, 122, 68, 110, 97, 101, 115, 111, 120, 90, 98, 56, 109, 76, 106, 102, 49, 54,
+        101, 52, 80, 87, 115, 78, 113, 76, 76, 106, 57, 117, 87, 77, 57, 84, 81, 56, 110, 78, 119,
+        120, 113, 69, 114, 68, 109, 75, 88, 76, 65, 78, 107, 114, 101, 99, 111, 118, 101, 114, 121,
+        75, 101, 121, 120, 57, 100, 105, 100, 58, 107, 101, 121, 58, 122, 68, 110, 97, 101, 115,
+        111, 120, 90, 98, 56, 109, 76, 106, 102, 49, 54, 101, 52, 80, 87, 115, 78, 113, 76, 76,
+        106, 57, 117, 87, 77, 57, 84, 81, 56, 110, 78, 119, 120, 113, 69, 114, 68, 109, 75, 88, 76,
+        65, 78,
+    ];
+    assert_eq!(op_bytes, encoded_bytes);
+
+    let sha256_str = "cg2dfxdh5voabmdjzw2abw3sgvtjymknh2bmpvtwot7t2ih4v7za";
+    let did_plc = "did:plc:cg2dfxdh5voabmdjzw2abw3s";
+
+    let digest_bytes: Vec<u8> = data_encoding::HEXLOWER
+        .decode(&sha256::digest(op_bytes).as_bytes())
+        .expect("SHA-256 digest is always hex string");
+    let digest_b32 = data_encoding::BASE32_NOPAD
+        .encode(&digest_bytes)
+        .to_ascii_lowercase();
+    assert_eq!(digest_b32, sha256_str);
+}
+
+#[test]
+fn test_did_plc_examples() {
+    // https://atproto.com/specs/did-plc
+    let op = CreateOp {
+        op_type: "create".to_string(),
+        signingKey: "did:key:zDnaejYFhgFiVF89LhJ4UipACLKuqo6PteZf8eKDVKeExXUPk".to_string(),
+        recoveryKey: "did:key:zDnaeSezF2TgCD71b5DiiFyhHQwKAfsBVqTTHRMvP597Z5Ztn".to_string(),
+        username: "alice.example.com".to_string(),
+        service: "https://example.com".to_string(),
+        prev: None,
+        sig:
+            "vi6JAl5W4FfyViD5_BKL9p0rbI3MxTWuh0g_egTFAjtf7gwoSfSe1O3qMOEUPX6QH3H0Q9M4y7gOLGblWkEwfQ"
+                .to_string(),
+    };
+    op.verify_self().unwrap();
+
+    // XXX: DID PLC generation is also also not consistent
+    //assert_eq!(&op.did_plc(), "did:plc:7iza6de2dwap2sbkpav7c6c6");
+
+    // interacting with PDS / PLC server
+    let op = CreateOp {
+        op_type: "create".to_string(),
+        signingKey: "did:key:zDnaekmbFffmpo7LZ4C7bEFjGKPk11N47kKN8j7jtAcGUabw3".to_string(),
+        recoveryKey: "did:key:zDnaekmbFffmpo7LZ4C7bEFjGKPk11N47kKN8j7jtAcGUabw3".to_string(),
+        username: "voltaire.test".to_string(),
+        service: "http://localhost:2583".to_string(),
+        prev: None,
+        sig:
+            "HNfQUg6SMnYKp1l3LtAIsoAblmi33mYiHE9JH1j7w3B-hd8xWpmCUBUoqKfQXmsAs0K1z8Izt19yYk6PqVFgyg"
+                .to_string(),
+    };
+    op.verify_self();
+    assert_eq!(&op.did_plc(), "did:plc:bmrcg7zrxoiw2kiml3tkw2xv");
+}
+
+#[test]
+fn test_self_verify() {
+    let keypair = KeyPair::new_random();
+    let op = CreateOp::new(
+        "dummy-handle".to_string(),
+        "https://dummy.service".to_string(),
+        &keypair,
+        None,
+    );
+    println!("{:?}", op);
+    op.verify_self().unwrap();
+}
+
+#[test]
+fn test_known_key() {
+    let keypair = KeyPair::new_random();
+    let op = CreateOp::new(
+        "dummy-handle".to_string(),
+        "https://dummy.service".to_string(),
+        &keypair,
+        None,
+    );
+    println!("{:?}", op);
+    op.verify_self().unwrap();
+}
diff --git a/adenosine-pds/src/lib.rs b/adenosine-pds/src/lib.rs
index e52cb69..8263ddc 100644
--- a/adenosine-pds/src/lib.rs
+++ b/adenosine-pds/src/lib.rs
@@ -6,15 +6,16 @@ use std::fmt;
 use std::path::PathBuf;
 use std::sync::Mutex;
 
-use ipfs_sqlite_block_store::BlockStore;
-
 mod car;
+mod crypto;
 mod db;
+mod did;
 mod models;
 pub mod mst;
 mod repo;
 
 pub use car::{load_car_to_blockstore, load_car_to_sqlite};
+pub use crypto::{KeyPair, PubKey};
 pub use db::AtpDatabase;
 pub use models::*;
 pub use repo::{RepoCommit, RepoStore};
@@ -112,6 +113,9 @@ fn xrpc_get_atproto(
     request: &Request,
 ) -> Result<serde_json::Value> {
     match method {
+        "getAccountsConfig" => {
+            Ok(json!({"availableUserDomains": ["test"], "inviteCodeRequired": false}))
+        }
         "getRecord" => {
             let did = request.get_param("user").unwrap();
             let collection = request.get_param("collection").unwrap();
diff --git a/adenosine-pds/src/repo.rs b/adenosine-pds/src/repo.rs
index 713210e..b74615b 100644
--- a/adenosine-pds/src/repo.rs
+++ b/adenosine-pds/src/repo.rs
@@ -5,7 +5,7 @@ use libipld::cbor::DagCborCodec;
 use libipld::multihash::Code;
 use libipld::prelude::Codec;
 use libipld::store::DefaultParams;
-use libipld::{Block, Cid, DagCbor, Ipld};
+use libipld::{Block, Cid, Ipld};
 use std::borrow::Cow;
 use std::collections::BTreeMap;
 use std::path::PathBuf;