From 4d411d29070aac5c009efec5513624b97ed67024 Mon Sep 17 00:00:00 2001 From: Conor Patrick Date: Mon, 15 Jul 2024 20:08:27 -0400 Subject: [PATCH] downgrade go-schnorrkel --- go.mod | 2 +- go.sum | 4 ++-- sr25519/sr25519.go | 27 ++++----------------------- 3 files changed, 7 insertions(+), 26 deletions(-) diff --git a/go.mod b/go.mod index c5f59c3..fb39710 100644 --- a/go.mod +++ b/go.mod @@ -3,7 +3,7 @@ module github.com/vedhavyas/go-subkey/v2 go 1.18 require ( - github.com/ChainSafe/go-schnorrkel v1.0.0 + github.com/ChainSafe/go-schnorrkel v0.0.0-20200405005733-88cbf1b4c40d github.com/decred/base58 v1.0.4 github.com/ethereum/go-ethereum v1.10.25 github.com/gtank/merlin v0.1.1 diff --git a/go.sum b/go.sum index 0dfa148..1bef3a3 100644 --- a/go.sum +++ b/go.sum @@ -1,5 +1,5 @@ -github.com/ChainSafe/go-schnorrkel v1.0.0 h1:3aDA67lAykLaG1y3AOjs88dMxC88PgUuHRrLeDnvGIM= -github.com/ChainSafe/go-schnorrkel v1.0.0/go.mod h1:dpzHYVxLZcp8pjlV+O+UR8K0Hp/z7vcchBSbMBEhCw4= +github.com/ChainSafe/go-schnorrkel v0.0.0-20200405005733-88cbf1b4c40d h1:nalkkPQcITbvhmL4+C4cKA87NW0tfm3Kl9VXRoPywFg= +github.com/ChainSafe/go-schnorrkel v0.0.0-20200405005733-88cbf1b4c40d/go.mod h1:URdX5+vg25ts3aCh8H5IFZybJYKWhJHYMTnf+ULtoC4= github.com/btcsuite/btcd/btcec/v2 v2.2.1 h1:xP60mv8fvp+0khmrN0zTdPC3cNm24rfeE6lh2R/Yv3E= github.com/btcsuite/btcd/btcec/v2 v2.2.1/go.mod h1:9/CSmJxmuvqzX9Wh2fXMWToLOHhPd11lSPuIupwTkI8= github.com/btcsuite/btcd/chaincfg/chainhash v1.0.1 h1:q0rUy8C/TYNBQS1+CGKw68tLOFYSNEs0TFnxxnS9+4U= diff --git a/sr25519/sr25519.go b/sr25519/sr25519.go index 100d62a..5537a48 100644 --- a/sr25519/sr25519.go +++ b/sr25519/sr25519.go @@ -40,8 +40,8 @@ func (kr keyRing) Verify(msg []byte, signature []byte) bool { if err := sig.Decode(sigs); err != nil { return false } - ok, err := kr.pub.Verify(sig, signingContext(msg)) - if err != nil || !ok { + ok := kr.pub.Verify(sig, signingContext(msg)) + if !ok { return false } @@ -155,23 +155,7 @@ func (s Scheme) FromSeed(seed []byte) (subkey.KeyPair, error) { } func (s Scheme) FromPhrase(phrase, pwd string) (subkey.KeyPair, error) { - ms, err := sr25519.MiniSecretKeyFromMnemonic(phrase, pwd) - if err != nil { - return nil, err - } - - secret := ms.ExpandEd25519() - pub, err := secret.Public() - if err != nil { - return nil, err - } - - seed := ms.Encode() - return keyRing{ - seed: seed[:], - secret: secret, - pub: pub, - }, nil + return nil, errors.New("not supported") } func (s Scheme) Derive(pair subkey.KeyPair, djs []subkey.DeriveJunction) (subkey.KeyPair, error) { @@ -215,10 +199,7 @@ func (s Scheme) FromPublicKey(bytes []byte) (subkey.PublicKey, error) { } arr := [32]byte{} copy(arr[:], bytes[:32]) - key, err := sr25519.NewPublicKey(arr) - if err != nil { - return nil, err - } + key := sr25519.NewPublicKey(arr) return &keyRing{pub: key}, nil }