Add EIP-712 typed data and EIP-191 support

go.mod

@@ -7,6 +7,7 @@ toolchain go1.23.7
 require (
 	github.com/decred/dcrd/hdkeychain/v3 v3.1.1
 	github.com/ethereum/go-ethereum v1.16.1
+	github.com/mdehoog/usbwallet v0.0.0-20250710022925-34afef9ca6e1
 	github.com/tyler-smith/go-bip39 v1.1.0
 	golang.org/x/exp v0.0.0-20231110203233-9a3e6036ecaa
 )
@@ -22,9 +23,14 @@ require (
 	github.com/decred/dcrd/dcrec/secp256k1/v4 v4.2.0 // indirect
 	github.com/ethereum/c-kzg-4844/v2 v2.1.0 // indirect
 	github.com/ethereum/go-verkle v0.2.2 // indirect
+	github.com/google/gousb v1.1.3 // indirect
 	github.com/holiman/uint256 v1.3.2 // indirect
 	github.com/karalabe/hid v1.0.1-0.20240306101548-573246063e52 // indirect
 	github.com/klauspost/cpuid/v2 v2.2.5 // indirect
+	github.com/mattn/go-runewidth v0.0.13 // indirect
+	github.com/nsf/termbox-go v0.0.0-20190325093121-288510b9734e // indirect
+	github.com/reserve-protocol/trezor v0.0.0-20190523030725-9e38328dde28 // indirect
+	github.com/rivo/uniseg v0.2.0 // indirect
 	github.com/supranational/blst v0.3.14 // indirect
 	golang.org/x/crypto v0.36.0 // indirect
 	golang.org/x/sync v0.12.0 // indirect

go.sum

@@ -58,6 +58,8 @@ github.com/golang/snappy v0.0.5-0.20220116011046-fa5810519dcb h1:PBC98N2aIaM3XXi
 github.com/golang/snappy v0.0.5-0.20220116011046-fa5810519dcb/go.mod h1:/XxbfmMg8lxefKM7IXC3fBNl/7bRcc72aCRzEWrmP2Q=
 github.com/google/go-cmp v0.5.8 h1:e6P7q2lk1O+qJJb4BtCQXlK8vWEO8V1ZeuEdJNOqZyg=
 github.com/google/go-cmp v0.5.8/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY=
+github.com/google/gousb v1.1.3 h1:xt6M5TDsGSZ+rlomz5Si5Hmd/Fvbmo2YCJHN+yGaK4o=
+github.com/google/gousb v1.1.3/go.mod h1:GGWUkK0gAXDzxhwrzetW592aOmkkqSGcj5KLEgmCVUg=
 github.com/holiman/uint256 v1.3.2 h1:a9EgMPSC1AAaj1SZL5zIQD3WbwTuHrMGOerLjGmM/TA=
 github.com/holiman/uint256 v1.3.2/go.mod h1:EOMSn4q6Nyt9P6efbI3bueV4e1b3dGlUCXeiRV4ng7E=
 github.com/karalabe/hid v1.0.1-0.20240306101548-573246063e52 h1:msKODTL1m0wigztaqILOtla9HeW1ciscYG4xjLtvk5I=
@@ -68,16 +70,23 @@ github.com/kylelemons/godebug v1.1.0 h1:RPNrshWIDI6G2gRW9EHilWtl7Z6Sb1BR0xunSBf0
 github.com/kylelemons/godebug v1.1.0/go.mod h1:9/0rRGxNHcop5bhtWyNeEfOS8JIWk580+fNqagV/RAw=
 github.com/leanovate/gopter v0.2.11 h1:vRjThO1EKPb/1NsDXuDrzldR28RLkBflWYcU9CvzWu4=
 github.com/leanovate/gopter v0.2.11/go.mod h1:aK3tzZP/C+p1m3SPRE4SYZFGP7jjkuSI4f7Xvpt0S9c=
+github.com/mattn/go-runewidth v0.0.4/go.mod h1:LwmH8dsx7+W8Uxz3IHJYH5QSwggIsqBzpuz5H//U1FU=
 github.com/mattn/go-runewidth v0.0.13 h1:lTGmDsbAYt5DmK6OnoV7EuIF1wEIFAcxld6ypU4OSgU=
 github.com/mattn/go-runewidth v0.0.13/go.mod h1:Jdepj2loyihRzMpdS35Xk/zdY8IAYHsh153qUoGf23w=
+github.com/mdehoog/usbwallet v0.0.0-20250710022925-34afef9ca6e1 h1:N3XNMcNb2Fx0tj6rY8DtdpCMSq7xm9lOHu2Os5V6JIU=
+github.com/mdehoog/usbwallet v0.0.0-20250710022925-34afef9ca6e1/go.mod h1:JomHHHCacgQZP1OoY7AYGB9T3OcGWT7fK8wTZ/jyhLM=
 github.com/minio/sha256-simd v1.0.0 h1:v1ta+49hkWZyvaKwrQB8elexRqm6Y0aMLjCNsrYxo6g=
 github.com/minio/sha256-simd v1.0.0/go.mod h1:OuYzVNI5vcoYIAmbIvHPl3N3jUzVedXbKy5RFepssQM=
 github.com/mitchellh/mapstructure v1.4.1 h1:CpVNEelQCZBooIPDn+AR3NpivK/TIKU8bDxdASFVQag=
 github.com/mitchellh/mapstructure v1.4.1/go.mod h1:bFUtVrKA4DC2yAKiSyO/QUcy7e+RRV2QTWOzhPopBRo=
+github.com/nsf/termbox-go v0.0.0-20190325093121-288510b9734e h1:Vbib8wJAaMEF9jusI/kMSYMr/LtRzM7+F9MJgt/nH8k=
+github.com/nsf/termbox-go v0.0.0-20190325093121-288510b9734e/go.mod h1:IuKpRQcYE1Tfu+oAQqaLisqDeXgjyyltCfsaoYN18NQ=
 github.com/olekukonko/tablewriter v0.0.5 h1:P2Ga83D34wi1o9J6Wh1mRuqd4mF/x/lgBS7N7AbDhec=
 github.com/olekukonko/tablewriter v0.0.5/go.mod h1:hPp6KlRPjbx+hW8ykQs1w3UBbZlj6HuIJcUGPhkA7kY=
 github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM=
 github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
+github.com/reserve-protocol/trezor v0.0.0-20190523030725-9e38328dde28 h1:0XRrYV4bb+Y09cLQKsVE5gQ3HRebPXxY89zx+ZV2Fo0=
+github.com/reserve-protocol/trezor v0.0.0-20190523030725-9e38328dde28/go.mod h1:Twg3zlQzleALAU+gR5xSK112gdh9YLcQ6owamVh0lbY=
 github.com/rivo/uniseg v0.2.0 h1:S1pD9weZBuJdFmowNwbpi7BJ8TNftyUImj/0WQi72jY=
 github.com/rivo/uniseg v0.2.0/go.mod h1:J6wj4VEh+S6ZtnVlnTBMWIodfgj8LQOQFoIToxlJtxc=
 github.com/shirou/gopsutil v3.21.4-0.20210419000835-c7a38de76ee5+incompatible h1:Bn1aCHHRnjv4Bl16T8rcaFjYSrGrIZvpiGO6P3Q4GpU=

main.go

@@ -3,7 +3,8 @@ package main
 import (
 	"bytes"
 	"crypto/ecdsa"
-	"encoding/hex"
+	"encoding/json"
+	"errors"
 	"flag"
 	"fmt"
 	"io"
@@ -14,9 +15,10 @@ import (
 
 	"github.com/decred/dcrd/hdkeychain/v3"
 	"github.com/ethereum/go-ethereum/accounts"
-	"github.com/ethereum/go-ethereum/accounts/usbwallet"
 	"github.com/ethereum/go-ethereum/common"
 	"github.com/ethereum/go-ethereum/crypto"
+	"github.com/ethereum/go-ethereum/signer/core/apitypes"
+	"github.com/mdehoog/usbwallet"
 	"github.com/tyler-smith/go-bip39"
 	"golang.org/x/exp/slices"
 )
@@ -29,6 +31,7 @@ func main() {
 	var address bool
 	var mnemonic string
 	var hdPath string
+	var text bool
 	var data string
 	var prefix string
 	var suffix string
@@ -41,6 +44,7 @@ func main() {
 	flag.BoolVar(&address, "address", false, "Print address of signer and exit")
 	flag.StringVar(&mnemonic, "mnemonic", "", "Mnemonic to use for signing")
 	flag.StringVar(&hdPath, "hd-paths", "m/44'/60'/0'/0/0", "Hierarchical deterministic derivation path for mnemonic or ledger")
+	flag.BoolVar(&text, "text", false, "Use EIP-191 message format for signing (default is EIP-712)")
 	flag.StringVar(&data, "data", "", "Data to be signed")
 	flag.StringVar(&prefix, "prefix", "vvvvvvvv", "String that prefixes the data to be signed")
 	flag.StringVar(&suffix, "suffix", "^^^^^^^^", "String that suffixes the data to be signed")
@@ -101,24 +105,42 @@ func main() {
 		}
 		fmt.Printf("\n%s exited with code 0\n", flag.Arg(0))
 	}
+	fmt.Println()
 
-	if index := strings.Index(string(input), prefix); prefix != "" && index >= 0 {
+	if index := bytes.Index(input, []byte(prefix)); prefix != "" && index >= 0 {
 		input = input[index+len(prefix):]
 	}
-	if index := strings.Index(string(input), suffix); suffix != "" && index >= 0 {
+	if index := bytes.Index(input, []byte(suffix)); suffix != "" && index >= 0 {
 		input = input[:index]
 	}
+	input = bytes.TrimSpace(input)
 
-	fmt.Println()
-	hash := common.FromHex(strings.TrimSpace(string(input)))
-	if len(hash) != 66 {
-		log.Fatalf("Expected EIP-712 hex string with 66 bytes, got %d bytes, value: %s", len(input), string(input))
+	var typedData *apitypes.TypedData
+	if bytes.HasPrefix(input, []byte("0x")) {
+		input = common.FromHex(string(input))
+	}
+	if bytes.HasPrefix(input, []byte("{")) && !text {
+		typedData = new(apitypes.TypedData)
+		if err := json.Unmarshal(input, typedData); err != nil {
+			log.Fatalf("Error parsing typed data: %v", err)
+		}
+	}
+	if typedData == nil && !text && len(input) != 66 {
+		log.Fatalf("Expected EIP-712 hex string with 66 bytes, got %d bytes", len(input))
 	}
 
-	domainHash := hash[2:34]
-	messageHash := hash[34:66]
-	fmt.Printf("Domain hash: 0x%s\n", hex.EncodeToString(domainHash))
-	fmt.Printf("Message hash: 0x%s\n", hex.EncodeToString(messageHash))
+	hashes := input
+	if typedData != nil {
+		_, hashesStr, err := apitypes.TypedDataAndHash(*typedData)
+		if err != nil {
+			log.Fatalf("Error hashing typed data: %v", err)
+		}
+		hashes = []byte(hashesStr)
+	}
+	if len(hashes) == 66 {
+		fmt.Printf("Domain hash: 0x%x\n", hashes[2:34])
+		fmt.Printf("Message hash: 0x%x\n", hashes[34:66])
+	}
 
 	if signerErr != nil {
 		log.Fatalf("Error creating signer: %v", signerErr)
@@ -129,15 +151,24 @@ func main() {
 	if ledger || trezor {
 		fmt.Printf("Data sent to device, awaiting signature...")
 	}
-	signature, err := s.sign(hash)
-	if err == accounts.ErrWalletClosed {
+	sign := func() ([]byte, error) {
+		if text {
+			return s.signText(input)
+		}
+		if typedData != nil {
+			return s.signData(*typedData)
+		}
+		return s.signHash(input)
+	}
+	signature, err := sign()
+	if errors.Is(err, accounts.ErrWalletClosed) {
 		// ledger is flaky sometimes, recreate and retry
 		fmt.Printf("failed with %s, retrying...", err.Error())
 		s, err = createSigner(privateKey, mnemonic, hdPath, index, ledger, trezor)
 		if err != nil {
 			log.Fatalf("Error creating signer: %v", err)
 		}
-		signature, err = s.sign(hash)
+		signature, err = sign()
 	}
 	if ledger || trezor {
 		fmt.Println("done")
@@ -146,9 +177,13 @@ func main() {
 		log.Fatalf("Error signing data: %v", err)
 	}
 
-	fmt.Printf("\nData: 0x%s\n", hex.EncodeToString(hash))
+	fmt.Println()
+	if typedData != nil {
+		fmt.Printf("Typed: 0x%x\n", input)
+	}
+	fmt.Printf("Data: 0x%x\n", hashes)
 	fmt.Printf("Signer: %s\n", s.address().String())
-	fmt.Printf("Signature: %s\n", hex.EncodeToString(signature))
+	fmt.Printf("Signature: %x\n", signature)
 }
 
 func run(workdir, name string, args ...string) ([]byte, error) {
@@ -226,7 +261,9 @@ func createSigner(privateKey, mnemonic, hdPath string, index int, ledger, trezor
 
 type signer interface {
 	address() common.Address
-	sign([]byte) ([]byte, error)
+	signHash(data []byte) ([]byte, error)
+	signText(data []byte) ([]byte, error)
+	signData(data apitypes.TypedData) ([]byte, error)
 }
 
 type ecdsaSigner struct {
@@ -237,8 +274,24 @@ func (s *ecdsaSigner) address() common.Address {
 	return crypto.PubkeyToAddress(s.PublicKey)
 }
 
-func (s *ecdsaSigner) sign(data []byte) ([]byte, error) {
-	sig, err := crypto.Sign(crypto.Keccak256(data), s.PrivateKey)
+func (s *ecdsaSigner) signHash(data []byte) ([]byte, error) {
+	return s.sign(crypto.Keccak256(data))
+}
+
+func (s *ecdsaSigner) signText(data []byte) ([]byte, error) {
+	return s.sign(accounts.TextHash(data))
+}
+
+func (s *ecdsaSigner) signData(data apitypes.TypedData) ([]byte, error) {
+	hash, _, err := apitypes.TypedDataAndHash(data)
+	if err != nil {
+		return nil, err
+	}
+	return s.sign(hash)
+}
+
+func (s *ecdsaSigner) sign(hash []byte) ([]byte, error) {
+	sig, err := crypto.Sign(hash, s.PrivateKey)
 	if err != nil {
 		return nil, err
 	}
@@ -247,18 +300,26 @@ func (s *ecdsaSigner) sign(data []byte) ([]byte, error) {
 }
 
 type walletSigner struct {
-	wallet  accounts.Wallet
+	wallet  usbwallet.Wallet
 	account accounts.Account
 }
 
 func (s *walletSigner) address() common.Address {
 	return s.account.Address
 }
 
-func (s *walletSigner) sign(data []byte) ([]byte, error) {
+func (s *walletSigner) signHash(data []byte) ([]byte, error) {
 	return s.wallet.SignData(s.account, accounts.MimetypeTypedData, data)
 }
 
+func (s *walletSigner) signText(data []byte) ([]byte, error) {
+	return s.wallet.SignText(s.account, data)
+}
+
+func (s *walletSigner) signData(data apitypes.TypedData) ([]byte, error) {
+	return s.wallet.SignTypedData(s.account, data)
+}
+
 func derivePrivateKey(mnemonic string, path accounts.DerivationPath) (*ecdsa.PrivateKey, error) {
 	// Parse the seed string into the master BIP32 key.
 	seed, err := bip39.NewSeedWithErrorChecking(mnemonic, "")