Add force sign hash wallet option

wallet/chain/p/signer/signer.go

@@ -9,6 +9,7 @@ import (
 	"github.com/ava-labs/avalanchego/vms/components/avax"
 	"github.com/ava-labs/avalanchego/vms/platformvm/fx"
 	"github.com/ava-labs/avalanchego/vms/platformvm/txs"
+	"github.com/ava-labs/avalanchego/wallet/subnet/primary/common"
 
 	stdcontext "context"
 )
@@ -24,7 +25,7 @@ type Signer interface {
 	//
 	// If the signer doesn't have the ability to provide a required signature,
 	// the signature slot will be skipped without reporting an error.
-	Sign(ctx stdcontext.Context, tx *txs.Tx) error
+	Sign(ctx stdcontext.Context, tx *txs.Tx, options ...common.Option) error
 }
 
 type Backend interface {
@@ -44,20 +45,24 @@ func New(kc keychain.Keychain, backend Backend) Signer {
 	}
 }
 
-func (s *txSigner) Sign(ctx stdcontext.Context, tx *txs.Tx) error {
+func (s *txSigner) Sign(ctx stdcontext.Context, tx *txs.Tx, options ...common.Option) error {
+	ops := common.NewOptions(options)
+
 	return tx.Unsigned.Visit(&visitor{
-		kc:      s.kc,
-		backend: s.backend,
-		ctx:     ctx,
-		tx:      tx,
+		kc:            s.kc,
+		backend:       s.backend,
+		ctx:           ctx,
+		tx:            tx,
+		forceSignHash: ops.ForceSignHash(),
 	})
 }
 
 func SignUnsigned(
 	ctx stdcontext.Context,
 	signer Signer,
 	utx txs.UnsignedTx,
+	options ...common.Option,
 ) (*txs.Tx, error) {
 	tx := &txs.Tx{Unsigned: utx}
-	return tx, signer.Sign(ctx, tx)
+	return tx, signer.Sign(ctx, tx, options...)
 }

wallet/chain/p/signer/visitor.go

@@ -37,10 +37,11 @@ var (
 
 // visitor handles signing transactions for the signer
 type visitor struct {
-	kc      keychain.Keychain
-	backend Backend
-	ctx     context.Context
-	tx      *txs.Tx
+	kc            keychain.Keychain
+	backend       Backend
+	ctx           context.Context
+	tx            *txs.Tx
+	forceSignHash bool
 }
 
 func (*visitor) AdvanceTimeTx(*txs.AdvanceTimeTx) error {
@@ -56,7 +57,7 @@ func (s *visitor) AddValidatorTx(tx *txs.AddValidatorTx) error {
 	if err != nil {
 		return err
 	}
-	return sign(s.tx, false, txSigners)
+	return sign(s.tx, s.forceSignHash, txSigners)
 }
 
 func (s *visitor) AddSubnetValidatorTx(tx *txs.AddSubnetValidatorTx) error {
@@ -69,15 +70,15 @@ func (s *visitor) AddSubnetValidatorTx(tx *txs.AddSubnetValidatorTx) error {
 		return err
 	}
 	txSigners = append(txSigners, subnetAuthSigners)
-	return sign(s.tx, false, txSigners)
+	return sign(s.tx, s.forceSignHash, txSigners)
 }
 
 func (s *visitor) AddDelegatorTx(tx *txs.AddDelegatorTx) error {
 	txSigners, err := s.getSigners(constants.PlatformChainID, tx.Ins)
 	if err != nil {
 		return err
 	}
-	return sign(s.tx, false, txSigners)
+	return sign(s.tx, s.forceSignHash, txSigners)
 }
 
 func (s *visitor) CreateChainTx(tx *txs.CreateChainTx) error {
@@ -90,15 +91,15 @@ func (s *visitor) CreateChainTx(tx *txs.CreateChainTx) error {
 		return err
 	}
 	txSigners = append(txSigners, subnetAuthSigners)
-	return sign(s.tx, false, txSigners)
+	return sign(s.tx, s.forceSignHash, txSigners)
 }
 
 func (s *visitor) CreateSubnetTx(tx *txs.CreateSubnetTx) error {
 	txSigners, err := s.getSigners(constants.PlatformChainID, tx.Ins)
 	if err != nil {
 		return err
 	}
-	return sign(s.tx, false, txSigners)
+	return sign(s.tx, s.forceSignHash, txSigners)
 }
 
 func (s *visitor) ImportTx(tx *txs.ImportTx) error {
@@ -111,15 +112,15 @@ func (s *visitor) ImportTx(tx *txs.ImportTx) error {
 		return err
 	}
 	txSigners = append(txSigners, txImportSigners...)
-	return sign(s.tx, false, txSigners)
+	return sign(s.tx, s.forceSignHash, txSigners)
 }
 
 func (s *visitor) ExportTx(tx *txs.ExportTx) error {
 	txSigners, err := s.getSigners(constants.PlatformChainID, tx.Ins)
 	if err != nil {
 		return err
 	}
-	return sign(s.tx, false, txSigners)
+	return sign(s.tx, s.forceSignHash, txSigners)
 }
 
 func (s *visitor) RemoveSubnetValidatorTx(tx *txs.RemoveSubnetValidatorTx) error {
@@ -182,7 +183,7 @@ func (s *visitor) BaseTx(tx *txs.BaseTx) error {
 	if err != nil {
 		return err
 	}
-	return sign(s.tx, false, txSigners)
+	return sign(s.tx, s.forceSignHash, txSigners)
 }
 
 func (s *visitor) ConvertSubnetToL1Tx(tx *txs.ConvertSubnetToL1Tx) error {

wallet/chain/p/signer/with_options.go

@@ -0,0 +1,35 @@
+// Copyright (C) 2019-2025, Ava Labs, Inc. All rights reserved.
+// See the file LICENSE for licensing terms.
+
+package signer
+
+import (
+	"context"
+
+	"github.com/ava-labs/avalanchego/vms/platformvm/txs"
+	"github.com/ava-labs/avalanchego/wallet/subnet/primary/common"
+)
+
+var _ Signer = (*withOptions)(nil)
+
+type withOptions struct {
+	signer  Signer
+	options []common.Option
+}
+
+// WithOptions returns a new signer that will use the given options by default.
+//
+//   - [signer] is the signer that will be called to perform the underlying
+//     operations.
+//   - [options] will be provided to the signer in addition to the options
+//     provided in the method calls.
+func WithOptions(signer Signer, options ...common.Option) Signer {
+	return &withOptions{
+		signer:  signer,
+		options: options,
+	}
+}
+
+func (w *withOptions) Sign(ctx context.Context, tx *txs.Tx, options ...common.Option) error {
+	return w.signer.Sign(ctx, tx, common.UnionOptions(w.options, options)...)
+}

wallet/chain/p/wallet/with_options.go

@@ -43,7 +43,7 @@ func (w *withOptions) Builder() builder.Builder {
 }
 
 func (w *withOptions) Signer() walletsigner.Signer {
-	return w.wallet.Signer()
+	return walletsigner.WithOptions(w.wallet.Signer(), w.options...)
 }
 
 func (w *withOptions) IssueBaseTx(

wallet/chain/x/signer/signer.go

@@ -10,6 +10,7 @@ import (
 	"github.com/ava-labs/avalanchego/utils/crypto/keychain"
 	"github.com/ava-labs/avalanchego/vms/avm/txs"
 	"github.com/ava-labs/avalanchego/vms/components/avax"
+	"github.com/ava-labs/avalanchego/wallet/subnet/primary/common"
 )
 
 var _ Signer = (*signer)(nil)
@@ -23,7 +24,7 @@ type Signer interface {
 	//
 	// If the signer doesn't have the ability to provide a required signature,
 	// the signature slot will be skipped without reporting an error.
-	Sign(ctx context.Context, tx *txs.Tx) error
+	Sign(ctx context.Context, tx *txs.Tx, options ...common.Option) error
 }
 
 type Backend interface {
@@ -42,20 +43,24 @@ func New(kc keychain.Keychain, backend Backend) Signer {
 	}
 }
 
-func (s *signer) Sign(ctx context.Context, tx *txs.Tx) error {
+func (s *signer) Sign(ctx context.Context, tx *txs.Tx, options ...common.Option) error {
+	ops := common.NewOptions(options)
+
 	return tx.Unsigned.Visit(&visitor{
-		kc:      s.kc,
-		backend: s.backend,
-		ctx:     ctx,
-		tx:      tx,
+		kc:            s.kc,
+		backend:       s.backend,
+		ctx:           ctx,
+		tx:            tx,
+		forceSignHash: ops.ForceSignHash(),
 	})
 }
 
 func SignUnsigned(
 	ctx context.Context,
 	signer Signer,
 	utx txs.UnsignedTx,
+	options ...common.Option,
 ) (*txs.Tx, error) {
 	tx := &txs.Tx{Unsigned: utx}
-	return tx, signer.Sign(ctx, tx)
+	return tx, signer.Sign(ctx, tx, options...)
 }

wallet/chain/x/signer/visitor.go

@@ -12,6 +12,7 @@ import (
 	"github.com/ava-labs/avalanchego/ids"
 	"github.com/ava-labs/avalanchego/utils/crypto/keychain"
 	"github.com/ava-labs/avalanchego/utils/crypto/secp256k1"
+	"github.com/ava-labs/avalanchego/utils/hashing"
 	"github.com/ava-labs/avalanchego/vms/avm/fxs"
 	"github.com/ava-labs/avalanchego/vms/avm/txs"
 	"github.com/ava-labs/avalanchego/vms/components/avax"
@@ -37,26 +38,27 @@ var (
 
 // visitor handles signing transactions for the signer
 type visitor struct {
-	kc      keychain.Keychain
-	backend Backend
-	ctx     context.Context
-	tx      *txs.Tx
+	kc            keychain.Keychain
+	backend       Backend
+	ctx           context.Context
+	tx            *txs.Tx
+	forceSignHash bool
 }
 
 func (s *visitor) BaseTx(tx *txs.BaseTx) error {
 	txCreds, txSigners, err := s.getSigners(s.ctx, tx.BlockchainID, tx.Ins)
 	if err != nil {
 		return err
 	}
-	return sign(s.tx, txCreds, txSigners)
+	return sign(s.tx, s.forceSignHash, txCreds, txSigners)
 }
 
 func (s *visitor) CreateAssetTx(tx *txs.CreateAssetTx) error {
 	txCreds, txSigners, err := s.getSigners(s.ctx, tx.BlockchainID, tx.Ins)
 	if err != nil {
 		return err
 	}
-	return sign(s.tx, txCreds, txSigners)
+	return sign(s.tx, s.forceSignHash, txCreds, txSigners)
 }
 
 func (s *visitor) OperationTx(tx *txs.OperationTx) error {
@@ -70,7 +72,7 @@ func (s *visitor) OperationTx(tx *txs.OperationTx) error {
 	}
 	txCreds = append(txCreds, txOpsCreds...)
 	txSigners = append(txSigners, txOpsSigners...)
-	return sign(s.tx, txCreds, txSigners)
+	return sign(s.tx, s.forceSignHash, txCreds, txSigners)
 }
 
 func (s *visitor) ImportTx(tx *txs.ImportTx) error {
@@ -84,15 +86,15 @@ func (s *visitor) ImportTx(tx *txs.ImportTx) error {
 	}
 	txCreds = append(txCreds, txImportCreds...)
 	txSigners = append(txSigners, txImportSigners...)
-	return sign(s.tx, txCreds, txSigners)
+	return sign(s.tx, s.forceSignHash, txCreds, txSigners)
 }
 
 func (s *visitor) ExportTx(tx *txs.ExportTx) error {
 	txCreds, txSigners, err := s.getSigners(s.ctx, tx.BlockchainID, tx.Ins)
 	if err != nil {
 		return err
 	}
-	return sign(s.tx, txCreds, txSigners)
+	return sign(s.tx, s.forceSignHash, txCreds, txSigners)
 }
 
 func (s *visitor) getSigners(ctx context.Context, sourceChainID ids.ID, ins []*avax.TransferableInput) ([]verify.Verifiable, [][]keychain.Signer, error) {
@@ -218,12 +220,13 @@ func (s *visitor) getOpsSigners(ctx context.Context, sourceChainID ids.ID, ops [
 	return txCreds, txSigners, nil
 }
 
-func sign(tx *txs.Tx, creds []verify.Verifiable, txSigners [][]keychain.Signer) error {
+func sign(tx *txs.Tx, signHash bool, creds []verify.Verifiable, txSigners [][]keychain.Signer) error {
 	codec := builder.Parser.Codec()
 	unsignedBytes, err := codec.Marshal(txs.CodecVersion, &tx.Unsigned)
 	if err != nil {
 		return fmt.Errorf("couldn't marshal unsigned tx: %w", err)
 	}
+	unsignedHash := hashing.ComputeHash256(unsignedBytes)
 
 	if expectedLen := len(txSigners); expectedLen != len(tx.Creds) {
 		tx.Creds = make([]*fxs.FxCredential, expectedLen)
@@ -282,7 +285,12 @@ func sign(tx *txs.Tx, creds []verify.Verifiable, txSigners [][]keychain.Signer)
 				continue
 			}
 
-			sig, err := signer.Sign(unsignedBytes)
+			var sig []byte
+			if signHash {
+				sig, err = signer.SignHash(unsignedHash)
+			} else {
+				sig, err = signer.Sign(unsignedBytes)
+			}
 			if err != nil {
 				return fmt.Errorf("problem signing tx: %w", err)
 			}

wallet/chain/x/signer/with_options.go

@@ -0,0 +1,35 @@
+// Copyright (C) 2019-2025, Ava Labs, Inc. All rights reserved.
+// See the file LICENSE for licensing terms.
+
+package signer
+
+import (
+	"context"
+
+	"github.com/ava-labs/avalanchego/vms/avm/txs"
+	"github.com/ava-labs/avalanchego/wallet/subnet/primary/common"
+)
+
+var _ Signer = (*withOptions)(nil)
+
+type withOptions struct {
+	signer  Signer
+	options []common.Option
+}
+
+// WithOptions returns a new signer that will use the given options by default.
+//
+//   - [signer] is the signer that will be called to perform the underlying
+//     operations.
+//   - [options] will be provided to the signer in addition to the options
+//     provided in the method calls.
+func WithOptions(signer Signer, options ...common.Option) Signer {
+	return &withOptions{
+		signer:  signer,
+		options: options,
+	}
+}
+
+func (w *withOptions) Sign(ctx context.Context, tx *txs.Tx, options ...common.Option) error {
+	return w.signer.Sign(ctx, tx, common.UnionOptions(w.options, options)...)
+}

wallet/chain/x/wallet.go

@@ -281,7 +281,7 @@ func (w *wallet) IssueUnsignedTx(
 ) (*txs.Tx, error) {
 	ops := common.NewOptions(options)
 	ctx := ops.Context()
-	tx, err := signer.SignUnsigned(ctx, w.signer, utx)
+	tx, err := signer.SignUnsigned(ctx, w.signer, utx, options...)
 	if err != nil {
 		return nil, err
 	}

wallet/chain/x/wallet_with_options.go

@@ -39,7 +39,7 @@ func (w *walletWithOptions) Builder() builder.Builder {
 }
 
 func (w *walletWithOptions) Signer() signer.Signer {
-	return w.wallet.Signer()
+	return signer.WithOptions(w.wallet.Signer(), w.options...)
 }
 
 func (w *walletWithOptions) IssueBaseTx(