signer: add SignTypedData; utils add EIP712Hash

Author: outprog

.gitignore

@@ -1 +1,2 @@
-prvkey
+prvkey
+go.sum

README.md

@@ -82,7 +82,7 @@ Ethereum Account which can be used to sign messages and transactions.
 
 - [x] SignTx
 - [x] SignMsg
-- [ ] SignTypedData
+- [x] SignTypedData
 
 ### Wallet
 
@@ -111,4 +111,5 @@ Creating Contract Instance for call & execute contract.
 
 - [x] EthToBN
 - [x] GweiToBN
+- [x] EIP712Hash
 - [x] Ecrecover

go.sum

@@ -10,6 +10,7 @@ import (
 	"github.com/ethereum/go-ethereum/common"
 	"github.com/ethereum/go-ethereum/core/types"
 	"github.com/ethereum/go-ethereum/crypto"
+	"github.com/ethereum/go-ethereum/signer/core"
 )
 
 type Signer struct {
@@ -62,3 +63,18 @@ func (s Signer) SignMsg(msg []byte) (sig []byte, err error) {
 	sig[64] += 27
 	return
 }
+
+func (s Signer) SignTypedData(typedData core.TypedData) (sig []byte, err error) {
+	hash, err := EIP712Hash(typedData)
+	if err != nil {
+		return
+	}
+
+	sig, err = crypto.Sign(hash, s.key)
+	if err != nil {
+		return
+	}
+
+	sig[64] += 27
+	return
+}

signer.go

@@ -1,11 +1,13 @@
 package goether
 
 import (
+	"encoding/json"
 	"math/big"
 	"testing"
 
 	"github.com/ethereum/go-ethereum/common"
 	"github.com/ethereum/go-ethereum/common/hexutil"
+	"github.com/ethereum/go-ethereum/signer/core"
 	"github.com/stretchr/testify/assert"
 )
 
@@ -25,7 +27,20 @@ func TestSignTx(t *testing.T) {
 }
 
 func TestSignMsg(t *testing.T) {
-	sign, err := TestSigner.SignMsg([]byte("123"))
+	sig, err := TestSigner.SignMsg([]byte("123"))
 	assert.NoError(t, err)
-	assert.Equal(t, "0x409c16579b4fc162f199f897497f5142101992af82cc6a0b9521413cf721151817e52781c0341fa333cdfea6ebe945b9231f8a8b3df7e7040203f9d7df26c2f21c", hexutil.Encode(sign))
+	assert.Equal(t, "0x409c16579b4fc162f199f897497f5142101992af82cc6a0b9521413cf721151817e52781c0341fa333cdfea6ebe945b9231f8a8b3df7e7040203f9d7df26c2f21c", hexutil.Encode(sig))
+}
+
+func TestSignTypedData(t *testing.T) {
+	typedDataJson := `{"primaryType":"Mail","types":{"EIP712Domain":[{"name":"name","type":"string"},{"name":"version","type":"string"},{"name":"chainId","type":"uint256"},{"name":"verifyingContract","type":"address"}],"Person":[{"name":"name","type":"string"},{"name":"wallet","type":"address"}],"Mail":[{"name":"from","type":"Person"},{"name":"to","type":"Person"},{"name":"contents","type":"string"}]},"domain":{"name":"Ether Mail","version":"1","chainId":1,"verifyingContract":"0xCcCCccccCCCCcCCCCCCcCcCccCcCCCcCcccccccC"},"message":{"from":{"name":"Cow","wallet":"0xCD2a3d9F938E13CD947Ec05AbC7FE734Df8DD826"},"to":{"name":"Bob","wallet":"0xbBbBBBBbbBBBbbbBbbBbbbbBBbBbbbbBbBbbBBbB"},"contents":"Hello, Bob!"}}`
+	var typedData core.TypedData
+	json.Unmarshal([]byte(typedDataJson), &typedData)
+	sig, err := TestSigner.SignTypedData(typedData)
+	assert.NoError(t, err)
+	assert.Equal(t, "0x0a80cc322f7a5e5e0965ff84fd76ea6479fae9d8ce29f7e076c3b9cb8e8097b80052ee91f1fad54d4348c518e42395848431746c8fee40420041f87ea05b5a281c", hexutil.Encode(sig))
+
+	hash, err := EIP712Hash(typedData)
+	addr, err := Ecrecover(hash, sig)
+	assert.Equal(t, "0xab6c371B6c466BcF14d4003601951e5873dF2AcA", addr.String())
 }

signer_test.go

@@ -6,6 +6,7 @@ import (
 
 	"github.com/ethereum/go-ethereum/common"
 	"github.com/ethereum/go-ethereum/crypto"
+	"github.com/ethereum/go-ethereum/signer/core"
 )
 
 func EthToBN(amount float64) (bn *big.Int) {
@@ -20,6 +21,20 @@ func GweiToBN(amount float64) (bn *big.Int) {
 	return bn
 }
 
+func EIP712Hash(typedData core.TypedData) (hash []byte, err error) {
+	domainSeparator, err := typedData.HashStruct("EIP712Domain", typedData.Domain.Map())
+	if err != nil {
+		return
+	}
+	typedDataHash, err := typedData.HashStruct(typedData.PrimaryType, typedData.Message)
+	if err != nil {
+		return
+	}
+	rawData := []byte(fmt.Sprintf("\x19\x01%s%s", string(domainSeparator), string(typedDataHash)))
+	hash = crypto.Keccak256(rawData)
+	return
+}
+
 func Ecrecover(hash, sig []byte) (addr common.Address, err error) {
 	if len(sig) != 65 {
 		err = fmt.Errorf("invalid length of signture: %d", len(sig))

utils.go

@@ -1,11 +1,13 @@
 package goether
 
 import (
+	"encoding/json"
 	"math/big"
 	"testing"
 
 	"github.com/ethereum/go-ethereum/accounts"
 	"github.com/ethereum/go-ethereum/common/hexutil"
+	"github.com/ethereum/go-ethereum/signer/core"
 	"github.com/stretchr/testify/assert"
 )
 
@@ -17,11 +19,27 @@ func TestGweiToBN(t *testing.T) {
 	assert.Equal(t, big.NewInt(1100000000), GweiToBN(1.1))
 }
 
+func TestEIP712(t *testing.T) {
+	raw := `{"types": {"EIP712Domain": [{"name": "name","type": "string"},{"name": "version","type": "string"},{"name": "chainId","type": "uint256"}],"Order": [{"name": "action","type": "string"},{"name": "orderHashes","type": "string[]"},{"name": "makerAddress","type": "address"}]},"primaryType": "Order","domain": {"name": "ZooDex","version": "1","chainId": "42"},"message": {"action": "cancelOrder","orderHashes": ["0x123", "0x456", "0x789"],"makerAddress": "0xf9593A9d7F735814B87D08e8D8aD624f58d53B10"}}
+	`
+	typedData := core.TypedData{}
+	err := json.Unmarshal([]byte(raw), &typedData)
+	assert.NoError(t, err)
+
+	hash, err := EIP712Hash(typedData)
+	assert.NoError(t, err)
+	assert.Equal(t, "0xcf3985dd9eb11ce656eafc2dddd08ce3058ad00c74669b3d171f31e9a0472d8e", hexutil.Encode(hash))
+
+	addr, err := Ecrecover(hash, hexutil.MustDecode("0xa9a3e5f72b48651b735d0908f1f240b06eafe7166dbe6b4fc8b57d8b8515ef555fe4b124c2b50d6907423426ec46bc12c5956942dcfd01e02d70912c87a389c41b"))
+	assert.NoError(t, err)
+	assert.Equal(t, "0xf9593A9d7F735814B87D08e8D8aD624f58d53B10", addr.String())
+}
+
 func TestEcrecover(t *testing.T) {
 	hash := accounts.TextHash([]byte("123"))
-	sign, _ := hexutil.Decode("0x409c16579b4fc162f199f897497f5142101992af82cc6a0b9521413cf721151817e52781c0341fa333cdfea6ebe945b9231f8a8b3df7e7040203f9d7df26c2f21c")
+	sig, _ := hexutil.Decode("0x409c16579b4fc162f199f897497f5142101992af82cc6a0b9521413cf721151817e52781c0341fa333cdfea6ebe945b9231f8a8b3df7e7040203f9d7df26c2f21c")
 
-	addr, err := Ecrecover(hash, sign)
+	addr, err := Ecrecover(hash, sig)
 	assert.NoError(t, err)
 	assert.Equal(t, "0xab6c371B6c466BcF14d4003601951e5873dF2AcA", addr.String())
 }