feat(stronghold): support secp256k1 curve #2724
+119
−64
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -7,8 +7,6 @@ operations are available from the stronghold plugin. | |
|
|
||
| All non-destructive operations are enabled by default. | ||
|
|
||
| #### This default permission set includes the following: | ||
|
|
||
| - `allow-create-client` | ||
|
|
@@ -28,7 +26,6 @@ All non-destructive operations are enabled by default. | |
| <th>Description</th> | ||
| </tr> | ||
|
|
||
| <tr> | ||
| <td> | ||
|
|
||
|
|
||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -35,25 +35,17 @@ | |
| "DefaultPermission": { | ||
| "description": "The default permission set of the plugin.\n\nWorks similarly to a permission with the \"default\" identifier.", | ||
| "type": "object", | ||
| "required": ["permissions"], | ||
| "properties": { | ||
| "version": { | ||
| "description": "The version of the permission.", | ||
| "type": ["integer", "null"], | ||
| "format": "uint64", | ||
| "minimum": 1.0 | ||
| }, | ||
| "description": { | ||
| "description": "Human-readable description of what the permission does. Tauri convention is to use `<h4>` headings in markdown content for Tauri documentation generation purposes.", | ||
| "type": ["string", "null"] | ||
| }, | ||
| "permissions": { | ||
| "description": "All permissions this set contains.", | ||
|
|
@@ -67,11 +59,7 @@ | |
| "PermissionSet": { | ||
| "description": "A set of direct permissions grouped together under a new name.", | ||
| "type": "object", | ||
| "required": ["description", "identifier", "permissions"], | ||
| "properties": { | ||
| "identifier": { | ||
| "description": "A unique identifier for the permission.", | ||
|
|
@@ -93,16 +81,11 @@ | |
| "Permission": { | ||
| "description": "Descriptions of explicit privileges of commands.\n\nIt can enable commands to be accessible in the frontend of the application.\n\nIf the scope is defined it can be used to fine grain control the access of individual or multiple commands.", | ||
| "type": "object", | ||
| "required": ["identifier"], | ||
| "properties": { | ||
| "version": { | ||
| "description": "The version of the permission.", | ||
| "type": ["integer", "null"], | ||
| "format": "uint64", | ||
| "minimum": 1.0 | ||
| }, | ||
|
|
@@ -112,10 +95,7 @@ | |
| }, | ||
| "description": { | ||
| "description": "Human-readable description of what the permission does. Tauri internal convention is to use `<h4>` headings in markdown content for Tauri documentation generation purposes.", | ||
| "type": ["string", "null"] | ||
| }, | ||
| "commands": { | ||
| "description": "Allowed or denied commands when using this permission.", | ||
|
|
@@ -139,10 +119,7 @@ | |
| }, | ||
| "platforms": { | ||
| "description": "Target platforms this permission applies. By default all platforms are affected by this permission.", | ||
| "type": ["array", "null"], | ||
| "items": { | ||
| "$ref": "#/definitions/Target" | ||
| } | ||
|
|
@@ -177,20 +154,14 @@ | |
| "properties": { | ||
| "allow": { | ||
| "description": "Data that defines what is allowed by the scope.", | ||
| "type": ["array", "null"], | ||
| "items": { | ||
| "$ref": "#/definitions/Value" | ||
| } | ||
| }, | ||
| "deny": { | ||
| "description": "Data that defines what is denied by the scope. This should be prioritized by validation logic.", | ||
| "type": ["array", "null"], | ||
| "items": { | ||
| "$ref": "#/definitions/Value" | ||
| } | ||
|
|
@@ -257,37 +228,27 @@ | |
| { | ||
| "description": "MacOS.", | ||
| "type": "string", | ||
| "enum": ["macOS"] | ||
| }, | ||
| { | ||
| "description": "Windows.", | ||
| "type": "string", | ||
| "enum": ["windows"] | ||
| }, | ||
| { | ||
| "description": "Linux.", | ||
| "type": "string", | ||
| "enum": ["linux"] | ||
| }, | ||
| { | ||
| "description": "Android.", | ||
| "type": "string", | ||
| "enum": ["android"] | ||
| }, | ||
| { | ||
| "description": "iOS.", | ||
| "type": "string", | ||
| "enum": ["iOS"] | ||
| } | ||
| ] | ||
| }, | ||
|
|
@@ -435,4 +396,4 @@ | |
| ] | ||
| } | ||
| } | ||
| } | ||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -20,9 +20,9 @@ use std::{ | |
| use crypto::keys::bip39; | ||
| use iota_stronghold::{ | ||
| procedures::{ | ||
| BIP39Generate, BIP39Recover, Curve, Ed25519Sign, GetEvmAddress, | ||
| KeyType as StrongholdKeyType, MnemonicLanguage, PublicKey, Secp256k1EcdsaFlavor, | ||
| Secp256k1EcdsaSign, Slip10Derive, Slip10DeriveInput, Slip10Generate, StrongholdProcedure, | ||
| }, | ||
| Client, Location, | ||
| }; | ||
|
|
@@ -107,13 +107,15 @@ impl From<Slip10DeriveInputDto> for Slip10DeriveInput { | |
| pub enum KeyType { | ||
| Ed25519, | ||
| X25519, | ||
| Secp256k1Ecdsa, | ||
| } | ||
|
|
||
| impl From<KeyType> for StrongholdKeyType { | ||
| fn from(ty: KeyType) -> StrongholdKeyType { | ||
| match ty { | ||
| KeyType::Ed25519 => StrongholdKeyType::Ed25519, | ||
| KeyType::X25519 => StrongholdKeyType::X25519, | ||
| KeyType::Secp256k1Ecdsa => StrongholdKeyType::Secp256k1Ecdsa, | ||
| } | ||
| } | ||
| } | ||
|
|
@@ -129,7 +131,7 @@ impl<'de> Deserialize<'de> for KeyType { | |
| type Value = KeyType; | ||
|
|
||
| fn expecting(&self, formatter: &mut fmt::Formatter) -> fmt::Result { | ||
| formatter.write_str("ed25519, x25519, or secp256k1_ecdsa") | ||
| } | ||
|
|
||
| fn visit_str<E>(self, value: &str) -> std::result::Result<Self::Value, E> | ||
|
|
@@ -139,6 +141,7 @@ impl<'de> Deserialize<'de> for KeyType { | |
| match value.to_lowercase().as_str() { | ||
| "ed25519" => Ok(KeyType::Ed25519), | ||
| "x25519" => Ok(KeyType::X25519), | ||
| "secp256k1_ecdsa" => Ok(KeyType::Secp256k1Ecdsa), | ||
| _ => Err(serde::de::Error::custom("unknown key type")), | ||
| } | ||
| } | ||
|
|
@@ -182,6 +185,16 @@ enum ProcedureDto { | |
| private_key: LocationDto, | ||
| msg: String, | ||
| }, | ||
| GetEvmAddress { | ||
| #[serde(rename = "privateKey")] | ||
| private_key: LocationDto, | ||
| }, | ||
| Secp256k1EcdsaSign { | ||
| flavor: Secp256k1EcdsaFlavor, | ||
| #[serde(rename = "privateKey")] | ||
| private_key: LocationDto, | ||
| msg: String, | ||
| }, | ||
|
Comment on lines
+188
to
+197
There was a problem hiding this comment. i couldn't try the changes yet but is this enum not missing a |
||
| } | ||
|
|
||
| impl From<ProcedureDto> for StrongholdProcedure { | ||
|
|
@@ -231,6 +244,20 @@ impl From<ProcedureDto> for StrongholdProcedure { | |
| msg: msg.as_bytes().to_vec(), | ||
| }) | ||
| } | ||
| ProcedureDto::GetEvmAddress { private_key } => { | ||
| StrongholdProcedure::GetEvmAddress(GetEvmAddress { | ||
| private_key: private_key.into(), | ||
| }) | ||
| } | ||
| ProcedureDto::Secp256k1EcdsaSign { | ||
| flavor, | ||
| private_key, | ||
| msg, | ||
| } => StrongholdProcedure::Secp256k1EcdsaSign(Secp256k1EcdsaSign { | ||
| flavor, | ||
| private_key: private_key.into(), | ||
| msg: msg.as_bytes().to_vec(), | ||
| }), | ||
| } | ||
| } | ||
| } | ||
|
|
||
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.