Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

feat(signer): ethereum implementation #1501

Merged
merged 19 commits into from
Apr 15, 2024
Merged

feat(signer): ethereum implementation #1501

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
19 commits
Select commit Hold shift + click to select a range
c109482
feat(signer): ethereum implementation
ryanleecode Mar 25, 2024
e500d75
fix: wasm tests
ryanleecode Mar 26, 2024
5bb6b17
updates
ryanleecode Mar 26, 2024
3662da7
remove from private key hex
ryanleecode Mar 27, 2024
2590e51
rename signer to subxt signer
ryanleecode Mar 27, 2024
337c192
remove unnecessary super usage
ryanleecode Mar 27, 2024
d9f8398
create internal verify in ecdsa and move to separate submodule
ryanleecode Mar 27, 2024
c9e916c
remove eth error struct
ryanleecode Mar 27, 2024
bf514d8
fix dev accounts and account derivation
ryanleecode Mar 28, 2024
c666212
Merge remote-tracking branch 'origin/master' into feat/signer/eth
ryanleecode Mar 28, 2024
15a6492
fix clippy
ryanleecode Mar 28, 2024
d4018a6
moar tests
ryanleecode Mar 28, 2024
22e2a21
fixes
ryanleecode Mar 28, 2024
1852a5b
replace eth checksum depedency
ryanleecode Mar 28, 2024
89931d5
add checksum implementation
ryanleecode Apr 1, 2024
92a6e8a
fix: wasm-tests
ryanleecode Apr 1, 2024
ff84def
Merge branch 'master' into feat/signer/eth
jsdw Apr 8, 2024
430b001
Tweaks to eth signer (#1526)
jsdw Apr 12, 2024
e53b1a3
Merge branch 'master' into feat/signer/eth
ryanleecode Apr 12, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
115 changes: 113 additions & 2 deletions Cargo.lock
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 1 addition & 0 deletions Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -150,6 +150,7 @@ hmac = { version = "0.12.1", default-features = false }
pbkdf2 = { version = "0.12.2", default-features = false }
schnorrkel = { version = "0.11.4", default-features = false }
secp256k1 = { version = "0.28.2", default-features = false }
keccak-hash = { version = "0.10.0", default-features = false }
secrecy = "0.8.0"
sha2 = { version = "0.10.8", default-features = false }
zeroize = { version = "1", default-features = false }
Expand Down
6 changes: 4 additions & 2 deletions signer/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ description = "Sign extrinsics to be submitted by Subxt"
keywords = ["parity", "subxt", "extrinsic", "signer"]

[features]
default = ["sr25519", "ecdsa", "subxt", "std", "native"]
default = ["sr25519", "ecdsa", "eth", "subxt", "std", "native"]
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I wonder whether this should be a default feature because I reckon "eth accounts/signer" is rather niche use case and most users won't need it.

Doesn't matter that much it's easy to opt-out anyway, @jsdw thoughts?

Copy link
Collaborator

@jsdw jsdw Mar 27, 2024 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The only reason I tend to default to having all feature flags is for nicer IDE/docs support (otherwise loads of stuff is greyed out). So this is consistent with what I did with the other signers, but I'd be very open to figuring out an approach which has IDEs/docs working nicely even without feature flags enabled here; I just haven't given it any thought :)

std = ["regex/std", "sp-crypto-hashing/std", "pbkdf2/std", "sha2/std", "hmac/std", "bip39/std", "schnorrkel/std", "secp256k1/std", "sp-core/std"]

# Pick the signer implementation(s) you need by enabling the
Expand All @@ -24,6 +24,7 @@ std = ["regex/std", "sp-crypto-hashing/std", "pbkdf2/std", "sha2/std", "hmac/std
# https://github.com/rust-bitcoin/rust-bitcoin/issues/930#issuecomment-1215538699
sr25519 = ["schnorrkel"]
ecdsa = ["secp256k1"]
eth = ["keccak-hash", "secp256k1"]

# Make the keypair algorithms here compatible with Subxt's Signer trait,
# so that they can be used to sign transactions for compatible chains.
Expand All @@ -50,14 +51,15 @@ bip39 = { workspace = true }
schnorrkel = { workspace = true, optional = true }
secp256k1 = { workspace = true, optional = true, features = ["alloc", "recovery"] }
secrecy = { workspace = true }

keccak-hash = { workspace = true, optional = true }

# We only pull this in to enable the JS flag for schnorrkel to use.
getrandom = { workspace = true, optional = true }

[dev-dependencies]
sp-core = { workspace = true }
sp-keyring = { workspace = true }
proptest = "1.4.0"

[package.metadata.cargo-machete]
ignored = ["getrandom"]
Expand Down
21 changes: 11 additions & 10 deletions signer/src/ecdsa.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -160,21 +160,22 @@ impl Keypair {

/// Sign some message. These bytes can be used directly in a Substrate `MultiSignature::Ecdsa(..)`.
pub fn sign(&self, message: &[u8]) -> Signature {
// From sp_core::ecdsa::sign:
let message_hash = sp_crypto_hashing::blake2_256(message);
// From sp_core::ecdsa::sign_prehashed:
let wrapped = Message::from_digest_slice(&message_hash).expect("Message is 32 bytes; qed");
let recsig: RecoverableSignature =
Secp256k1::signing_only().sign_ecdsa_recoverable(&wrapped, &self.0.secret_key());
// From sp_core::ecdsa's `impl From<RecoverableSignature> for Signature`:
let (recid, sig): (_, [u8; 64]) = recsig.serialize_compact();
let mut signature_bytes: [u8; 65] = [0; 65];
signature_bytes[..64].copy_from_slice(&sig);
signature_bytes[64] = (recid.to_i32() & 0xFF) as u8;
Signature(signature_bytes)
Signature(sign(&self.0.secret_key(), &wrapped))
}
}

pub(crate) fn sign(secret_key: &secp256k1::SecretKey, message: &Message) -> [u8; 65] {
let recsig: RecoverableSignature =
Secp256k1::signing_only().sign_ecdsa_recoverable(message, secret_key);
let (recid, sig): (_, [u8; 64]) = recsig.serialize_compact();
let mut signature_bytes: [u8; 65] = [0; 65];
signature_bytes[..64].copy_from_slice(&sig);
signature_bytes[64] = (recid.to_i32() & 0xFF) as u8;
signature_bytes
}

/// Verify that some signature for a message was created by the owner of the [`PublicKey`].
///
/// ```rust
Expand Down
Loading
Loading