Merge pull request #72 from ava-labs/match-mm-sig

Match mm sig

Author: patrick-ogrady

chain/crypto.go

@@ -0,0 +1,34 @@
+// Copyright (C) 2019-2021, Ava Labs, Inc. All rights reserved.
+// See the file LICENSE for licensing terms.
+
+package chain
+
+import (
+	"crypto/ecdsa"
+
+	"github.com/ethereum/go-ethereum/crypto"
+)
+
+const (
+	legacySigAdj = 27
+)
+
+func Sign(dh []byte, priv *ecdsa.PrivateKey) ([]byte, error) {
+	sig, err := crypto.Sign(dh, priv)
+	if err != nil {
+		return nil, err
+	}
+	sig[64] += legacySigAdj
+	return sig, nil
+}
+
+func DeriveSender(dh []byte, sig []byte) (*ecdsa.PublicKey, error) {
+	if len(sig) != crypto.SignatureLength {
+		return nil, ErrInvalidSignature
+	}
+	// Avoid modifying the signature in place in case it is used elsewhere
+	sigcpy := make([]byte, crypto.SignatureLength)
+	copy(sigcpy, sig)
+	sigcpy[64] -= legacySigAdj
+	return crypto.SigToPub(dh, sigcpy)
+}

chain/tx.go

@@ -55,11 +55,6 @@ func (t *Transaction) Init(g *Genesis) error {
 	}
 	t.id = id
 
-	// Extract address
-	if len(t.Signature) != crypto.SignatureLength {
-		return ErrInvalidSignature
-	}
-
 	// Compute digest hash
 	dh, err := DigestHash(t.UnsignedTransaction)
 	if err != nil {
@@ -68,7 +63,7 @@ func (t *Transaction) Init(g *Genesis) error {
 	t.digestHash = dh
 
 	// Derive sender
-	pk, err := crypto.SigToPub(t.digestHash, t.Signature)
+	pk, err := DeriveSender(t.digestHash, t.Signature)
 	if err != nil {
 		return err
 	}

chain/tx_test.go

@@ -40,7 +40,7 @@ func TestTransaction(t *testing.T) {
 		if len(dh) != 32 {
 			t.Fatalf("hash insufficient d=%d", len(dh))
 		}
-		tx.Signature, err = crypto.Sign(dh, priv)
+		tx.Signature, err = Sign(dh, priv)
 		if err != nil {
 			t.Fatal(err)
 		}
@@ -133,7 +133,7 @@ func createTestTx(t *testing.T, blockID ids.ID, priv *ecdsa.PrivateKey) *Transac
 	if len(dh) != 32 {
 		t.Fatalf("hash insufficient d=%d", len(dh))
 	}
-	sig, err := crypto.Sign(dh, priv)
+	sig, err := Sign(dh, priv)
 	if err != nil {
 		t.Fatal(err)
 	}

client/helper.go

@@ -11,7 +11,6 @@ import (
 	"time"
 
 	"github.com/ava-labs/avalanchego/ids"
-	"github.com/ethereum/go-ethereum/crypto"
 	"github.com/fatih/color"
 
 	"github.com/ava-labs/spacesvm/chain"
@@ -67,7 +66,7 @@ func SignIssueTx(
 		return ids.Empty, fmt.Errorf("%w: failed to compute digest hash", err)
 	}
 
-	sig, err := crypto.Sign(dh, priv)
+	sig, err := chain.Sign(dh, priv)
 	if err != nil {
 		return ids.Empty, err
 	}
@@ -144,7 +143,7 @@ func SignIssueRawTx(
 		return ids.Empty, err
 	}
 
-	sig, err := crypto.Sign(dh, priv)
+	sig, err := chain.Sign(dh, priv)
 	if err != nil {
 		return ids.Empty, err
 	}

mempool/mempool_benchmark_test.go

@@ -78,7 +78,7 @@ func createTestMempool(
 				Space: string(pfx),
 			},
 		}
-		sig, err := crypto.Sign(tx.DigestHash(), priv)
+		sig, err := chain.Sign(tx.DigestHash(), priv)
 		if err != nil {
 			b.Fatal(err)
 		}

mempool/mempool_test.go

@@ -33,7 +33,7 @@ func TestMempool(t *testing.T) {
 		if err != nil {
 			t.Fatal(err)
 		}
-		sig, err := crypto.Sign(dh, priv)
+		sig, err := chain.Sign(dh, priv)
 		if err != nil {
 			t.Fatal(err)
 		}

tests/integration/integration_test.go

@@ -331,7 +331,7 @@ var _ = ginkgo.Describe("[ClaimTx]", func() {
 
 		dh, err := chain.DigestHash(utx)
 		gomega.Ω(err).Should(gomega.BeNil())
-		sig, err := crypto.Sign(dh, priv)
+		sig, err := chain.Sign(dh, priv)
 		gomega.Ω(err).Should(gomega.BeNil())
 
 		tx := chain.NewTx(utx, sig)
@@ -509,7 +509,7 @@ func expectBlkAccept(
 
 	dh, err := chain.DigestHash(utx)
 	gomega.Ω(err).Should(gomega.BeNil())
-	sig, err := crypto.Sign(dh, signer)
+	sig, err := chain.Sign(dh, signer)
 	gomega.Ω(err).Should(gomega.BeNil())
 
 	tx := chain.NewTx(utx, sig)