From c9cf37a0fc706790068561a589f6c3825472baaa Mon Sep 17 00:00:00 2001
From: Shun Kakinoki <shunkakinoki@gmail.com>
Date: Mon, 3 Mar 2025 21:26:06 -0700
Subject: [PATCH] chore: update

---
 wallet.go | 31 ++++++++++++++++---------------
 1 file changed, 16 insertions(+), 15 deletions(-)

diff --git a/wallet.go b/wallet.go
index a11870be..030f64ad 100644
--- a/wallet.go
+++ b/wallet.go
@@ -855,7 +855,22 @@ func (w *Wallet[C]) IsValidSignature(digest common.Hash, signature []byte) (bool
 
 func (w *Wallet[C]) buildSignature(ctx context.Context, sign core.SigningFunction, chainID *big.Int) ([]byte, core.Signature[C], error) {
 	var coreWalletConfig core.WalletConfig = w.config
-	if config, ok := coreWalletConfig.(*v2.WalletConfig); ok {
+
+	if config, ok := coreWalletConfig.(*v1.WalletConfig); ok {
+		sig, err := config.BuildSignature(ctx, sign, false)
+		if err != nil {
+			return nil, nil, fmt.Errorf("SignDigest, BuildSignature: %w", err)
+		}
+
+		sigEnc, err := sig.Data()
+		if err != nil {
+			return nil, nil, fmt.Errorf("SignDigest, sig.Data: %w", err)
+		}
+
+		sigTyped, _ := sig.(core.Signature[C])
+		// todo: implement core.Signature[core.WalletConfig] wrapper
+		return sigEnc, sigTyped, nil
+	} else if config, ok := coreWalletConfig.(*v2.WalletConfig); ok {
 		var (
 			sig core.Signature[*v2.WalletConfig]
 			err error
@@ -902,20 +917,6 @@ func (w *Wallet[C]) buildSignature(ctx context.Context, sign core.SigningFunctio
 			return nil, nil, fmt.Errorf("SignDigest, sig.Data: %w", err)
 		}
 
-		sigTyped, _ := sig.(core.Signature[C])
-		// todo: implement core.Signature[core.WalletConfig] wrapper
-		return sigEnc, sigTyped, nil
-	} else if config, ok := coreWalletConfig.(*v1.WalletConfig); ok {
-		sig, err := config.BuildSignature(ctx, sign, false)
-		if err != nil {
-			return nil, nil, fmt.Errorf("SignDigest, BuildSignature: %w", err)
-		}
-
-		sigEnc, err := sig.Data()
-		if err != nil {
-			return nil, nil, fmt.Errorf("SignDigest, sig.Data: %w", err)
-		}
-
 		sigTyped, _ := sig.(core.Signature[C])
 		// todo: implement core.Signature[core.WalletConfig] wrapper
 		return sigEnc, sigTyped, nil