Merge pull request #33 from TBD54566975/dht-create

Add DHT create support
decentralized-identity · Feb 24, 2024 · f8a901b · f8a901b
2 parents c13d00f + 3984685
commit f8a901b
Show file tree

Hide file tree

Showing 28 changed files with 1,331 additions and 381 deletions.
diff --git a/crypto/dsa/dsa.go b/crypto/dsa/dsa.go
@@ -94,3 +94,14 @@ func PublicKeyToBytes(publicKey jwk.JWK) ([]byte, error) {
 		return nil, fmt.Errorf("unsupported key type: %s", publicKey.KTY)
 	}
 }
+
+func AlgorithmID(jwk *jwk.JWK) (string, error) {
+	switch jwk.KTY {
+	case ecdsa.KeyType:
+		return ecdsa.AlgorithmID(jwk)
+	case eddsa.KeyType:
+		return eddsa.AlgorithmID(jwk)
+	default:
+		return "", fmt.Errorf("unsupported key type: %s", jwk.KTY)
+	}
+}
diff --git a/crypto/dsa/ecdsa/ecdsa.go b/crypto/dsa/ecdsa/ecdsa.go
@@ -85,3 +85,12 @@ func PublicKeyToBytes(publicKey jwk.JWK) ([]byte, error) {
 func SupportsAlgorithmID(id string) bool {
 	return algorithmIDs[id]
 }
+
+func AlgorithmID(jwk *jwk.JWK) (string, error) {
+	switch jwk.CRV {
+	case SECP256K1JWACurve:
+		return SECP256K1AlgorithmID, nil
+	default:
+		return "", fmt.Errorf("unsupported curve: %s", jwk.CRV)
+	}
+}
diff --git a/crypto/dsa/ecdsa/secp256k1.go b/crypto/dsa/ecdsa/secp256k1.go
@@ -29,7 +29,6 @@ func SECP256K1GeneratePrivateKey() (jwk.JWK, error) {
 	yBytes := pubKey.Y().Bytes()
 
 	privateKey := jwk.JWK{
-		ALG: SECP256K1JWA,
 		KTY: KeyType,
 		CRV: SECP256K1JWACurve,
 		D:   base64.RawURLEncoding.EncodeToString(dBytes[:]),
@@ -97,7 +96,6 @@ func SECP256K1BytesToPublicKey(input []byte) (jwk.JWK, error) {
 	}
 
 	return jwk.JWK{
-		ALG: SECP256K1JWA,
 		KTY: KeyType,
 		CRV: SECP256K1JWACurve,
 		X:   base64.RawURLEncoding.EncodeToString(pubKey.X().Bytes()),

diff --git a/crypto/dsa/eddsa/ed25519.go b/crypto/dsa/eddsa/ed25519.go
@@ -22,7 +22,6 @@ func ED25519GeneratePrivateKey() (jwk.JWK, error) {
 	}
 
 	privKeyJwk := jwk.JWK{
-		ALG: JWA,
 		KTY: KeyType,
 		CRV: ED25519JWACurve,
 		D:   base64.RawURLEncoding.EncodeToString(privateKey),
@@ -58,7 +57,6 @@ func ED25519BytesToPublicKey(input []byte) (jwk.JWK, error) {
 	}
 
 	return jwk.JWK{
-		ALG: JWA,
 		KTY: KeyType,
 		CRV: ED25519JWACurve,
 		X:   base64.RawURLEncoding.EncodeToString(input),

diff --git a/crypto/dsa/eddsa/eddsa.go b/crypto/dsa/eddsa/eddsa.go
@@ -82,3 +82,12 @@ func PublicKeyToBytes(publicKey jwk.JWK) ([]byte, error) {
 func SupportsAlgorithmID(id string) bool {
 	return algorithmIDs[id]
 }
+
+func AlgorithmID(jwk *jwk.JWK) (string, error) {
+	switch jwk.CRV {
+	case ED25519JWACurve:
+		return ED25519AlgorithmID, nil
+	default:
+		return "", fmt.Errorf("unsupported curve: %s", jwk.CRV)
+	}
+}
diff --git a/dids/didcore/resolution.go b/dids/didcore/resolution.go
@@ -1,10 +1,13 @@
 package didcore
 
+import "context"
+
 // MethodResolver is an interface that can be implemented for resolving specific DID methods.
 // Each concrete implementation should adhere to the DID core specficiation defined here:
 // https://www.w3.org/TR/did-core/#did-resolution
 type MethodResolver interface {
 	Resolve(uri string) (ResolutionResult, error)
+	ResolveWithContext(ctx context.Context, uri string) (ResolutionResult, error)
 }
 
 // ResolutionResult represents the result of a DID (Decentralized Identifier)

diff --git a/dids/diddht/bep44_test.go b/dids/diddht/bep44_test.go