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: configurable ecdsa curve and support secp256k1 #45

Open
wants to merge 2 commits into
base: main
Choose a base branch
from
+148 −48
Open

feat: configurable ecdsa curve and support secp256k1 #45

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
d6e974f
feat: configurable curve and support secp256k1
LanfordCai Dec 28, 2024
2657fed
test: add cases for secp256k1
LanfordCai Dec 29, 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
31 changes: 25 additions & 6 deletions mpc/binance/ecdsa/mpc.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,9 @@ import (
"github.com/bnb-chain/tss-lib/v2/ecdsa/keygen"
"github.com/bnb-chain/tss-lib/v2/ecdsa/signing"
"github.com/bnb-chain/tss-lib/v2/tss"
"github.com/btcsuite/btcd/btcec/v2"
s256k1 "github.com/btcsuite/btcd/btcec/v2"
"github.com/decred/dcrd/dcrec/secp256k1/v4"
"github.com/golang/protobuf/proto"
"github.com/golang/protobuf/ptypes/any"
)
Expand Down Expand Up @@ -106,14 +109,20 @@ type party struct {
in chan tss.Message
shareData *keygen.LocalPartySaveData
closeChan chan struct{}
curve elliptic.Curve
}

func NewParty(id uint16, logger Logger) *party {
func NewParty(id uint16, curve elliptic.Curve, logger Logger) *party {
if curve == nil {
curve = s256k1.S256()
}

return &party{
logger: logger,
id: tss.NewPartyID(fmt.Sprintf("%d", id), "", big.NewInt(int64(id))),
out: make(chan tss.Message, 1000),
in: make(chan tss.Message, 1000),
curve: curve,
}
}

Expand Down Expand Up @@ -190,7 +199,17 @@ func (p *party) ThresholdPK() ([]byte, error) {
if err != nil {
return nil, err
}
return x509.MarshalPKIXPublicKey(pk)

switch p.curve.Params().Name {
case string(tss.Secp256k1):
xFieldVal, yFieldVal := new(secp256k1.FieldVal), new(secp256k1.FieldVal)
xFieldVal.SetByteSlice(pk.X.Bytes())
yFieldVal.SetByteSlice(pk.Y.Bytes())
btcecPubKey := btcec.NewPublicKey(xFieldVal, yFieldVal)
return btcecPubKey.SerializeCompressed(), nil
default:
return x509.MarshalPKIXPublicKey(pk)
}
}

func (p *party) SetShareData(shareData []byte) error {
Expand All @@ -199,9 +218,9 @@ func (p *party) SetShareData(shareData []byte) error {
if err != nil {
return fmt.Errorf("failed deserializing shares: %w", err)
}
localSaveData.ECDSAPub.SetCurve(elliptic.P256())
localSaveData.ECDSAPub.SetCurve(p.curve)
for _, xj := range localSaveData.BigXj {
xj.SetCurve(elliptic.P256())
xj.SetCurve(p.curve)
}
p.shareData = &localSaveData
return nil
Expand All @@ -210,7 +229,7 @@ func (p *party) SetShareData(shareData []byte) error {
func (p *party) Init(parties []uint16, threshold int, sendMsg func(msg []byte, isBroadcast bool, to uint16)) {
partyIDs := partyIDsFromNumbers(parties)
ctx := tss.NewPeerContext(partyIDs)
p.params = tss.NewParameters(elliptic.P256(), ctx, p.id, len(parties), threshold)
p.params = tss.NewParameters(p.curve, ctx, p.id, len(parties), threshold)
p.id.Index = p.locatePartyIndex(p.id)
p.sendMsg = sendMsg
p.closeChan = make(chan struct{})
Expand All @@ -237,7 +256,7 @@ func (p *party) Sign(ctx context.Context, msgHash []byte) ([]byte, error) {

end := make(chan *common.SignatureData, 1)

msgToSign := hashToInt(msgHash, elliptic.P256())
msgToSign := hashToInt(msgHash, p.curve)
party := signing.NewLocalParty(msgToSign, p.params, *p.shareData, p.out, end)

var endWG sync.WaitGroup
Expand Down
90 changes: 63 additions & 27 deletions mpc/binance/ecdsa/mpc_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@ package ecdsa
import (
"context"
"crypto/ecdsa"
"crypto/elliptic"
"fmt"
"math/big"
"sync"
Expand All @@ -17,6 +18,10 @@ import (
"time"

"github.com/bnb-chain/tss-lib/v2/tss"
"github.com/btcsuite/btcd/btcec/v2"
s256k1 "github.com/btcsuite/btcd/btcec/v2"
btcecdsa "github.com/btcsuite/btcd/btcec/v2/ecdsa"
"github.com/decred/dcrd/dcrec/secp256k1/v4"
"github.com/stretchr/testify/assert"
"go.uber.org/zap"
)
Expand Down Expand Up @@ -108,45 +113,76 @@ func (parties parties) Mapping() map[string]*tss.PartyID {
}

func TestTSS(t *testing.T) {
Copy link
Contributor

Choose a reason for hiding this comment

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

we should add another test which initializes it with secp256k1.

Perhaps add a loop that iterates over both curve options?

Copy link
Author

Choose a reason for hiding this comment

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

I have added a loop to iterate over the curves

pA := NewParty(1, logger("pA", t.Name()))
pB := NewParty(2, logger("pB", t.Name()))
pC := NewParty(3, logger("pC", t.Name()))
curves := []elliptic.Curve{
elliptic.P256(),
s256k1.S256(),
}

for _, tc := range curves {
t.Run(tc.Params().Name, func(t *testing.T) {
pA := NewParty(1, tc, logger("pA", t.Name()))
pB := NewParty(2, tc, logger("pB", t.Name()))
pC := NewParty(3, tc, logger("pC", t.Name()))

t.Logf("Created parties")

t.Logf("Created parties")
parties := parties{pA, pB, pC}
parties.init(senders(parties))

parties := parties{pA, pB, pC}
parties.init(senders(parties))
t.Logf("Running DKG")

t.Logf("Running DKG")
t1 := time.Now()
shares, err := parties.keygen()
assert.NoError(t, err)
t.Logf("DKG elapsed %s", time.Since(t1))

t1 := time.Now()
shares, err := parties.keygen()
assert.NoError(t, err)
t.Logf("DKG elapsed %s", time.Since(t1))
parties.init(senders(parties))

parties.init(senders(parties))
parties.setShareData(shares)
t.Logf("Signing")

parties.setShareData(shares)
t.Logf("Signing")
msgToSign := []byte("bla bla")

msgToSign := []byte("bla bla")
t.Logf("Signing message")
t1 = time.Now()
sigs, err := parties.sign(digest(msgToSign))
assert.NoError(t, err)
t.Logf("Signing completed in %v", time.Since(t1))

sigSet := make(map[string]struct{})
for _, s := range sigs {
sigSet[string(s)] = struct{}{}
}
assert.Len(t, sigSet, 1)

t.Logf("Signing message")
t1 = time.Now()
sigs, err := parties.sign(digest(msgToSign))
assert.NoError(t, err)
t.Logf("Signing completed in %v", time.Since(t1))
pk, err := parties[0].TPubKey()
assert.NoError(t, err)

sigSet := make(map[string]struct{})
for _, s := range sigs {
sigSet[string(s)] = struct{}{}
assert.True(t, verifySignature(tc.Params().Name, pk, msgToSign, sigs[0]))
})
}
assert.Len(t, sigSet, 1)
}

func verifySignature(curveName string, pk *ecdsa.PublicKey, msg []byte, sig []byte) bool {
switch curveName {
case elliptic.P256().Params().Name:
return ecdsa.VerifyASN1(pk, digest(msg), sig)
case s256k1.S256().Params().Name:
// convert pk to s256k1.PublicKey
xFieldVal, yFieldVal := new(secp256k1.FieldVal), new(secp256k1.FieldVal)
xFieldVal.SetByteSlice(pk.X.Bytes())
yFieldVal.SetByteSlice(pk.Y.Bytes())
btcecPubKey := btcec.NewPublicKey(xFieldVal, yFieldVal)

signature, err := btcecdsa.ParseDERSignature(sig)
if err != nil {
return false
}

pk, err := parties[0].TPubKey()
assert.NoError(t, err)
return signature.Verify(digest(msg), btcecPubKey)
}

assert.True(t, ecdsa.VerifyASN1(pk, digest(msgToSign), sigs[0]))
return false
}

func senders(parties parties) []Sender {
Expand Down
73 changes: 58 additions & 15 deletions test/binance/ecdsa_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,51 +2,94 @@ package binance_test

import (
"crypto/ecdsa"
"crypto/elliptic"
"crypto/x509"
"testing"

ecdsa_scheme "github.com/IBM/TSS/mpc/binance/ecdsa"
. "github.com/IBM/TSS/types"
s256k1 "github.com/btcsuite/btcd/btcec/v2"
btcecdsa "github.com/btcsuite/btcd/btcec/v2/ecdsa"

"github.com/stretchr/testify/assert"
)

func TestThresholdBinanceECDSA(t *testing.T) {
n := 4
curves := []elliptic.Curve{
elliptic.P256(),
s256k1.S256(),
}

var verifySig signatureVerifyFunc
for _, curve := range curves {
t.Run(curve.Params().Name, func(t *testing.T) {
n := 4

var signatureAlgorithms func([]*commLogger) (func(uint16) KeyGenerator, func(uint16) Signer)
var verifySig signatureVerifyFunc
var signatureAlgorithms func([]*commLogger) (func(uint16) KeyGenerator, func(uint16) Signer)

verifySig = verifySignatureECDSA
signatureAlgorithms = ecdsaKeygenAndSign
verifySig = getVerifySignature(curve)
signatureAlgorithms = func(loggers []*commLogger) (func(uint16) KeyGenerator, func(uint16) Signer) {
return ecdsaKeygenAndSign(curve, loggers)
}

testScheme(t, n, signatureAlgorithms, verifySig, false)
testScheme(t, n, signatureAlgorithms, verifySig, false)
})
}
}

func TestFastThresholdBinanceECDSA(t *testing.T) {
n := 4
curves := []elliptic.Curve{
elliptic.P256(),
s256k1.S256(),
}

var verifySig signatureVerifyFunc
for _, curve := range curves {
t.Run(curve.Params().Name, func(t *testing.T) {
n := 4

var signatureAlgorithms func([]*commLogger) (func(uint16) KeyGenerator, func(uint16) Signer)
var verifySig signatureVerifyFunc
var signatureAlgorithms func([]*commLogger) (func(uint16) KeyGenerator, func(uint16) Signer)

verifySig = verifySignatureECDSA
signatureAlgorithms = ecdsaKeygenAndSign
verifySig = getVerifySignature(curve)
signatureAlgorithms = func(loggers []*commLogger) (func(uint16) KeyGenerator, func(uint16) Signer) {
return ecdsaKeygenAndSign(curve, loggers)
}

testScheme(t, n, signatureAlgorithms, verifySig, true)
testScheme(t, n, signatureAlgorithms, verifySig, true)
})
}
}

func ecdsaKeygenAndSign(loggers []*commLogger) (func(id uint16) KeyGenerator, func(id uint16) Signer) {
func ecdsaKeygenAndSign(curve elliptic.Curve, loggers []*commLogger) (func(id uint16) KeyGenerator, func(id uint16) Signer) {
kgf := func(id uint16) KeyGenerator {
return ecdsa_scheme.NewParty(id, loggers[id-1])
return ecdsa_scheme.NewParty(id, curve, loggers[id-1])
}

sf := func(id uint16) Signer {
return ecdsa_scheme.NewParty(id, loggers[id-1])
return ecdsa_scheme.NewParty(id, curve, loggers[id-1])
}
return kgf, sf
}

func getVerifySignature(curve elliptic.Curve) func(pkBytes []byte, t *testing.T, msg string, signature []byte) {
switch curve.Params().Name {
case s256k1.S256().Params().Name:
return verifySignatureSecp256k1
default:
return verifySignatureECDSA
}
}

func verifySignatureSecp256k1(pkBytes []byte, t *testing.T, msg string, signature []byte) {
pk, err := s256k1.ParsePubKey(pkBytes)
assert.NoError(t, err)

sig, err := btcecdsa.ParseDERSignature(signature)
assert.NoError(t, err)

assert.True(t, sig.Verify(sha256Digest([]byte(msg)), pk))
}

func verifySignatureECDSA(pkBytes []byte, t *testing.T, msg string, signature []byte) {
pk, err := x509.ParsePKIXPublicKey(pkBytes)
assert.NoError(t, err)
Expand Down
2 changes: 2 additions & 0 deletions test/go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,6 +49,8 @@ require (
gopkg.in/yaml.v3 v3.0.1 // indirect
)

replace github.com/IBM/TSS/mpc/binance/ecdsa => ../mpc/binance/ecdsa
Copy link
Contributor

Choose a reason for hiding this comment

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

no, let's not do this.

You can make a change to the mpc/binance/ecdsa package in this PR, and then wait for this PR to be merged, and then make a new PR that would just take the latest version into the go.mod of the test module.


replace github.com/IBM/TSS/mpc/bls => ../mpc/bls

replace github.com/agl/ed25519 => github.com/binance-chain/edwards25519 v0.0.0-20200305024217-f36fc4b53d43
Expand Down