Wallet interface

.golangci.yml

@@ -90,7 +90,7 @@ linters-settings:
         disabled: false
       # https://github.com/mgechev/revive/blob/master/RULES_DESCRIPTIONS.md#unused-receiver
       - name: unused-receiver
-        disabled: false
+        disabled: true
       # https://github.com/mgechev/revive/blob/master/RULES_DESCRIPTIONS.md#useless-break
       - name: useless-break
         disabled: false

account/account.go

@@ -0,0 +1,17 @@
+// Copyright (C) 2025, Ava Labs, Inc. All rights reserved.
+// See the file LICENSE for licensing terms.
+package account
+
+import (
+	"github.com/ava-labs/avalanchego/vms/secp256k1fx"
+
+	"github.com/ava-labs/avalanche-tooling-sdk-go/network"
+)
+
+// Account represents the interface for different account implementations
+type Account interface {
+	// GetPChainAddress returns the P-Chain address for the given network
+	GetPChainAddress(network network.Network) (string, error)
+
+	GetKeychain() (*secp256k1fx.Keychain, error)
+}

account/local_account.go

@@ -0,0 +1,53 @@
+// Copyright (C) 2025, Ava Labs, Inc. All rights reserved.
+// See the file LICENSE for licensing terms.
+package account
+
+import (
+	"fmt"
+
+	"github.com/ava-labs/avalanchego/vms/secp256k1fx"
+
+	"github.com/ava-labs/avalanche-tooling-sdk-go/key"
+	"github.com/ava-labs/avalanche-tooling-sdk-go/network"
+)
+
+// LocalAccount represents a local account implementation
+type LocalAccount struct {
+	*key.SoftKey
+}
+
+// NewLocalAccount creates a new LocalAccount
+func NewLocalAccount() (Account, error) {
+	k, err := key.NewSoft()
+	if err != nil {
+		return nil, err
+	}
+	return &LocalAccount{
+		SoftKey: k,
+	}, nil
+}
+
+func Import(keyPath string) (Account, error) {
+	k, err := key.LoadSoft(keyPath)
+	if err != nil {
+		return nil, err
+	}
+	return &LocalAccount{
+		SoftKey: k,
+	}, nil
+}
+
+func (a *LocalAccount) GetPChainAddress(network network.Network) (string, error) {
+	if a.SoftKey == nil {
+		return "", fmt.Errorf("SoftKey not initialized")
+	}
+	pchainAddrs, err := a.SoftKey.GetNetworkChainAddress(network, "P")
+	return pchainAddrs[0], err
+}
+
+func (a *LocalAccount) GetKeychain() (*secp256k1fx.Keychain, error) {
+	if a.SoftKey == nil {
+		return nil, fmt.Errorf("SoftKey not initialized")
+	}
+	return a.SoftKey.KeyChain(), nil
+}

blockchain/blockchain.go

@@ -11,7 +11,6 @@ import (
 	"fmt"
 	"math/big"
 	"os"
-	"time"
 
 	"github.com/ava-labs/avalanchego/ids"
 	"github.com/ava-labs/avalanchego/utils/logging"
@@ -25,14 +24,9 @@ import (
 
 	"github.com/ava-labs/avalanche-tooling-sdk-go/evm"
 	"github.com/ava-labs/avalanche-tooling-sdk-go/interchain"
-	"github.com/ava-labs/avalanche-tooling-sdk-go/multisig"
 	"github.com/ava-labs/avalanche-tooling-sdk-go/network"
-	"github.com/ava-labs/avalanche-tooling-sdk-go/utils"
 	"github.com/ava-labs/avalanche-tooling-sdk-go/validatormanager"
 	"github.com/ava-labs/avalanche-tooling-sdk-go/vm"
-	"github.com/ava-labs/avalanche-tooling-sdk-go/wallet"
-
-	commonAvago "github.com/ava-labs/avalanchego/wallet/subnet/primary/common"
 )
 
 var (
@@ -306,57 +300,6 @@ func vmID(vmName string) (ids.ID, error) {
 	return ids.ToID(b)
 }
 
-func (c *Subnet) Commit(ms multisig.Multisig, wallet wallet.Wallet, waitForTxAcceptance bool) (ids.ID, error) {
-	if ms.Undefined() {
-		return ids.Empty, multisig.ErrUndefinedTx
-	}
-	isReady, err := ms.IsReadyToCommit()
-	if err != nil {
-		return ids.Empty, err
-	}
-	if !isReady {
-		return ids.Empty, errors.New("tx is not fully signed so can't be committed")
-	}
-	tx, err := ms.GetWrappedPChainTx()
-	if err != nil {
-		return ids.Empty, err
-	}
-	const (
-		repeats             = 3
-		sleepBetweenRepeats = 2 * time.Second
-	)
-	var issueTxErr error
-	if err != nil {
-		return ids.Empty, err
-	}
-	for i := 0; i < repeats; i++ {
-		ctx, cancel := utils.GetAPILargeContext()
-		defer cancel()
-		options := []commonAvago.Option{commonAvago.WithContext(ctx)}
-		if !waitForTxAcceptance {
-			options = append(options, commonAvago.WithAssumeDecided())
-		}
-		// TODO: split error checking and recovery between issuing and waiting for status
-		issueTxErr = wallet.P().IssueTx(tx, options...)
-		if issueTxErr == nil {
-			break
-		}
-		if ctx.Err() != nil {
-			issueTxErr = fmt.Errorf("timeout issuing/verifying tx with ID %s: %w", tx.ID(), issueTxErr)
-		} else {
-			issueTxErr = fmt.Errorf("error issuing tx with ID %s: %w", tx.ID(), issueTxErr)
-		}
-		time.Sleep(sleepBetweenRepeats)
-	}
-	if issueTxErr != nil {
-		return ids.Empty, fmt.Errorf("issue tx error %w", issueTxErr)
-	}
-	if _, ok := ms.PChainTx.Unsigned.(*txs.CreateSubnetTx); ok {
-		c.SubnetID = tx.ID()
-	}
-	return tx.ID(), issueTxErr
-}
-
 // InitializeProofOfAuthority setups PoA manager after a successful execution of
 // ConvertSubnetToL1Tx on P-Chain
 // needs the list of validators for that tx,