Skip to content

downgrade go-schnorrkel #1

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

Open
conorpp wants to merge 1 commit into
base: master
Choose a base branch
from
Open

downgrade go-schnorrkel #1

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
2 changes: 1 addition & 1 deletion go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions go.sum
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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=
Expand Down
27 changes: 4 additions & 23 deletions sr25519/sr25519.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
}

Expand Down Expand Up @@ -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) {
Expand Down Expand Up @@ -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
}